[darcs-users] Resolving conflicts in a push only repo

[Richard A. Smith]

VMiklos wrote:

> On Fri, Nov 04, 2005 at 03:40:33PM -0600, "Richard A. Smith" <rsmith at bitworks-inc.com> wrote:
>> I have a push only repo that we use for our master copy of things.  Each developer pushes 
>> and pulls to/from this repo with no local modifications.
>>
>> There was a conflict with a push and so I just went to the master repo and did a pull and 
>> then resolved the conflict. But now I'm not sure how to proceed. I seem to remember 
>> reading that you really don't want to make any local changes to a push only repo but how 
>> would I resolve conflicts otherwise.
> 
> when you push, the server executes a darcs apply. what about using there
> the --dont-allow-conflicts option?

Darcs by default won't allow a push to cause a conflict.  Thats why I 
went to the master and did a pull from my local.  So if I do a record 
I'm going to introduce a local modification into the master repo.  And 
I'm looking for advice on if thats bad or not.


-- 
Richard A. Smith
Bitworks, Inc