Hi, --- On Wed, Dec 16, 2009 at 9:04 AM, Kenneth Gonsalves <[email protected]> wrote: | how does one resolve conflicts in mercurial? | This does not seem to work in mercurial - and I find the docs unclear also. I notice two files on a | resolve - one is marked .orig. Whatever I do the hg reports merge failure. Any | tips? \--
You can manually fix the file that has the resolve conflict, and then do: $ hg resolve -m <filename> There is "A worked example" here: http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html SK -- Shakthi Kannan http://www.shakthimaan.com _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
