[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] merge conflicts
From: |
Stephen Leake |
Subject: |
Re: [Monotone-devel] merge conflicts |
Date: |
Wed, 16 Dec 2009 19:24:24 -0500 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.2 (windows-nt) |
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
- [Monotone-devel] merge conflicts, Mando Rodriguez, 2009/12/03
- Re: [Monotone-devel] merge conflicts, Thomas Keller, 2009/12/03
- Message not available
- Re: [Monotone-devel] merge conflicts, Thomas Keller, 2009/12/04
- Message not available
- Message not available
- Re: [Monotone-devel] merge conflicts, Mando Rodriguez, 2009/12/11
- Re: [Monotone-devel] merge conflicts, Stephen Leake, 2009/12/12
- Re: [Monotone-devel] merge conflicts, Thomas Keller, 2009/12/12
- Re: [Monotone-devel] merge conflicts, Stephen Leake, 2009/12/12
- Re: [Monotone-devel] merge conflicts, Stephen Leake, 2009/12/12
- Re: [Monotone-devel] merge conflicts, Hugo Cornelis, 2009/12/16
- Re: [Monotone-devel] merge conflicts,
Stephen Leake <=
- Re: [Monotone-devel] merge conflicts, Zack Weinberg, 2009/12/16
- Re: [Monotone-devel] merge conflicts, hendrik, 2009/12/16