> --- On Fri, Dec 18, 2009 at 7:15 AM, Kenneth Gonsalves > > > > <[email protected]> wrote: > > | 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. > > > > \-- > > > > If you could mention the exact hg commands that A, and B are using, it > > will be helpful to reproduce the scenario. > > > > > BTW, the repo has multiple heads (hg heads). Nothing wrong with that - just wondering how that would play out in a merge scenario with multiple repos.
Ramaswamy _______________________________________________ ILUGC Mailing List: http://www.ae.iitm.ac.in/mailman/listinfo/ilugc
