Also keep in mind that git has cheap and easy branching. If I think a merge could be problematic I create a branch for the merge. So if
master has the changes I want to merge in and
ba is my branch that needs the code from master I might do the following:
git checkout ba git checkout -b ba-merge git merge master .... review new code and fix conflicts.... git commit git checkout ba git merge ba-merge git branch -d ba-merge git merge master
End result is that I got to try out the merge on a throw-away branch before screwing with my branch. If I get my self tangled up I can just delete the
ba-merge branch and start over.