Recently, I have been working (again) on a Compass port of the famous Twitter Bootstrap framework. There have been many ports of it, but none that used mixins. Almost all just translated everything to SASS and made it into a plugin. What I wanted was a bunch of mixins so you don’t have to put “span4″s in your markup (which I really don’t like).
Anyway, I had been working on it a while back and left it in a dirty branch. I started working on the develop branch and now, I wanted to merge it back to master – only I knew there were so many changes, renames etc, that would bring me to git hell.
A quick Google search gave me my ticket to bypass git hell.
git checkout develop git merge -s ours master git checkout master git merge developSweet!