Thursday, November 4, 2010

Mercurial rebase/merge musings

I asked about how-to-check-for-potential-merge-rebase-conflicts-in-mercurial on StackOverflow yesterday and got a few interesting responses.

I think I'm going to write a small plugin that rebases if there are no file conflicts, and merges otherwise. This is what I want myself and everyone else to do, as it helps with clearing up bad merges afterwards, and avoid "'rebase broke the build and my life sucks" situtations.

Update 2010-11-27: I've written an extension for this, see this post for details and links.
Post a Comment