[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
|
From: |
Andreas Schwab |
|
Subject: |
Re: merge conlict? |
|
Date: |
Tue, 26 Jan 2010 10:29:30 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
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.
Andreas.
--
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
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