dbrosius at mebigfatguy.com
Sat Jun 11 06:58:29 CDT 2011
On 06/11/2011 07:31 AM, norricorp wrote:
> Hi Na'Tosha,
> thanks for this. What about the situation where developer pulls latest from
> central to local, merges, tests and before he pushes back, another developer
> has pushed back.
> Presumably one wants to avoid a situation where there are several heads in
> the central repos.
The nice thing is that when this situation occurs, Mercurial doesn't
allow you to push by default. The developer needs to pull/merge/commit
again, and then try to push.
The benefit of this is, the person who is stuck doing the merge (when
painful --rarely) is the one who understands what the changes are. This
is way better then having a 'central repo maintainer' who's job it is to
manage the pushes to the central repo. That poor guy has no idea how to
resolve merges since it's not his code changes.
I'd highly recommend against a central repo czar in the corporate
More information about the Mercurial