How to perform multi-stage and/or multi-developer merge in Mercurial?
The problem is following:
We have default and feature branch and at some point we have to bring
changes from default to feature branch.
The changes are numerous and cannot be merged by one team member because
the different changes were introduced by different people and the
conflicts that are numerous need to be resolved by the people who
introduced them.
Is it possible to perform multiple stage merge so that everybody on the
team resolves their own conflicts on their workstation using some
mechanism within the Mercurial itself?
Any idea how to do it other then put everyone into one office on one
computer and lock them up until they are finished?
No comments:
Post a Comment