Re: [Monotone-devel] merge conflicts

[Stephen Leake]

Hugo Cornelis <address@hidden> writes:

> From viewpoint of the concepts, I would think that a merge conflict
> resolution implemented by one user and pushed to a central repository,
> would be honored automatically by repositories that only pull from
> that central repository, such that these 'pull-only repositories' can
> continue to serve their task.  But our experience indicates otherwise:
> after manual resolution of all merge conflicts in one repository that
> occasionally syncs with the central server, we still have to go
> through other repositories that only pull from the server to resolve
> what is essentially the same conflict.  This behavior just seems
> incorrect.

You'll have to be more specific. Certainly the 'pull-only
repositories' will pull the merged revision, and there will be no more
merges required. So I don't see a problem.

Can you give a use case that is a problem?

-- 
-- Stephe