Forgot to astroturf my post on the PLM tech blog. Everything you wanted to know about Dealing with Git Merge Revisions but were afraid to ask.