On Wednesday 16 Dec 2009 10:59:47 am Shakthi Kannan wrote: > <[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> >
it never works. The resolve goes through but commit says 'unmerged changes - cannot commit' and merge says 'uncommitted changes merge failure'. this has happened several times. -- regards kg http://lawgon.livejournal.com _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
