Update c4science branch from upstream
-------------------------------------

# Get changes and merge
git fetch upstream
git merge --squash upstream/stable

# Fix conflict
vim $(grep -rl '<<<<<<<' --exclude-dir=.git)

# Copy files from upstream if needed
for i in $(grep -rl '<<<<<<<' --exclude-dir=.git); do
    grep -rnl c4s $i > /dev/null || cp ../PH-UPSTREAM/$i $i
done

# Commit and push
git commit -am "Merge with Stable Week XXX"
git push origin stable

DEBUG
-----

# Check all the differences with the upstream branch
git fetch upstream
git diff --diff-filter=a upstream/stable..HEAD