[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: NEVER use `bzr push' for sending changes upstream
From: |
Óscar Fuentes |
Subject: |
Re: NEVER use `bzr push' for sending changes upstream |
Date: |
Mon, 25 Jan 2010 19:28:40 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
address@hidden (Mark A. Hershberger) writes:
> Óscar Fuentes <address@hidden> writes:
>
>>> (Btw, address@hidden bounces.)
>
> I'll fix that. “bzr whoami” to the rescue.
>
>
>> Mark did "merge & push" twice, so it is very likely that that is his
>> usual workflow. It is *very* damaging for the VC history.
>
> Appologies. I'll make any changes suggested in this thread. I didn't
> intend to commit twice. I got confused by the second conflict.
Hello Mark.
If there is a reason for not following the worflow described in
http://www.emacswiki.org/emacs/BzrForEmacsDevs
or if you misunderstood something, please describe what's wrong for you
and we'll try to fix it.
Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Óscar Fuentes, 2010/01/25
Re: merge conlict?, Andreas Schwab, 2010/01/25