On Thursday 17 Dec 2009 8:57:41 pm S.Ramaswamy wrote: > You probably already know this.The conflict resolution procedure in > mercurial: > > 1. hg pull > 2. hg update ( steps 1 & 2 can be combined with hg pull -u ) > 3. hg merge (if step 2 fails) > 4. Find out files with conflicts with 'hg status' > 5. Sort out conflict either with GUI merge tool or by physically removing > conflict markers etc (depending on your merge tool configuration) > 6. hg resolve -m "***" > 7. hg ci -m "***" > 8. hg push (etc)
our work flow is like this: there are two developers, each with their own repo - they commit to a bitbucket repo. When the code is approved it is pulled to the production site. So there are totally 4 repos. A commits code and pushes it. B changes the same line that A has changed and commits. Then B pulls A's code. Whatever B tries, he is unable to merge. alternative scenario - B finds bitbucket site is down and has to push directly to production. Later A changes the same line of code and that is pulled to production. merge/commit/update fails on the production site. on several occasions I had to solve the problem by rm -rf ing the repo and cloning it afresh > > Is this a repo that's publicly available for cloning ? > http://bitbucket.org/lawgon/certificate/ - last time we had problems it was with the last line of web/admin.py -- regards kg http://lawgon.livejournal.com _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
