[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: |
Mon, 25 Jan 2010 20:39:14 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
Óscar Fuentes <address@hidden> writes:
> Andreas Schwab <address@hidden> writes:
>
>> Óscar Fuentes <address@hidden> writes:
>>
>>> the merged branch is recreated
>>
>> What does that mean?
>
> You branch from trunk on a way that the result is the branch which was
> merged into trunk.
How does that magically turn a non-bisectable branch into a bisectable
one?
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?, (continued)
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?,
Andreas Schwab <=
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Stefan Monnier, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Stefan Monnier, 2010/01/26