iFixit/git-scripts — pull request #31 by xiongchiamiov (2012-12-08 00:07:15+00:00)
Title: Update branches before merging them.

We had a problem where Stefan merged a branch that he had previously
checked-out, so the merge didn't include later commits.