On Friday 18 Dec 2009 11:03:07 am Kenneth Gonsalves wrote: > probably hell - I am on mercurial after 5 years of svn, and still have a > tendency to do things the svn way. Anyway I played with 4 repos and now > have figured it out: > > 1. hg pull > 2. hg merge > if conflict: > 3. edit file > 4. hg merge -m filename > 5. hg commit >
typo, should be: 4. hg resolve -m filename -- regards kg http://lawgon.livejournal.com _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
