Merge git branches

merge_branch.sh

# https://stackoverflow.com/questions/449541/how-to-selectively-merge-or-pick-changes-from-another-branch-in-git

# merge branch SOURCE to DETINATION
git checkout DESTINATION
git merge --no-ff --no-commit SOURCE

# inspect and solve potential conflicts
git status
git diff --cached file1

# can change fileX locally, save and commit it if desired

# if you want to keep local (DESTINATION) version of fileX:
git checkout HEAD fileX

# if you want ONLY the SOURCE version of fileX
git checkout SOURCE fileX

# finally commit, add message.
git commit