Comments on: Handling merge conflicts with Mercurial http://bruno.defraine.net/techtips/handling-merge-conflicts-with-mercurial/ Collection of assorted technology tips Tue, 30 May 2017 02:56:35 +0000 hourly 1 http://wordpress.org/?v=3.9.19 By: Handling merge conflicts with git | Keep It With Mine http://bruno.defraine.net/techtips/handling-merge-conflicts-with-mercurial/#comment-1759 Wed, 23 Jan 2013 15:31:14 +0000 http://bruno.defraine.net/techtips/?p=18#comment-1759 [...] a similar post for Mercurial, this tip tries to document a list of systematic steps to handle merge conflicts with [...]

]]>