[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
|
From: |
Óscar Fuentes |
|
Subject: |
Re: merge conlict? |
|
Date: |
Tue, 26 Jan 2010 11:10:07 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
Andreas Schwab <address@hidden> writes:
> Stefan Monnier <address@hidden> writes:
>
>> I've just added
>>
>> append_revisions_only = True
>>
>> to the .../trunk/.bzr/branch/branch.conf which should reject a "bzr
>> push" that does this kind of ancestor-shifting.
>
> That setting has no influence.
bzr developers says it has. Have you tried it? Can you describe how it
failed?
Re: merge conlict?, Stefan Monnier, 2010/01/25
Re: merge conlict?, Teemu Likonen, 2010/01/25
Interpreting git diff --cc [was: merge conlict?], Stephen J. Turnbull, 2010/01/25
Re: merge conlict?, Richard Stallman, 2010/01/25
Re: merge conlict?, Richard Stallman, 2010/01/25