Tuesday, July 01, 2014

merge

I'm a little new at mercurial. The merge process, though I'm sure it is well documented, was a little intimidating (lots of diff's with little clear context.) I also had the backward desire to bring changes from the default/main branch into a feature branch (it's taking a while, but I want to make sure I'm close to current.) That wasn't what I got from randomly pushing buttons in bitbucket, so I decided to make a throw away branch from default, and merge this into the feature branch. That actually did the right thing, and edit/commit seemed more straightforward a way to deal with conflicts than a weird vimdiff window. In their defense, I remember the first time I saw a monticello merge window, and it was only slightly more friendly to figure out without instructions, and I think you really need an internal model of what's going on.

I decided to move the live site into the 'live' branch, so default doesn't matter or mean anything, and can take whatever merges make sense.