[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: aborting a merge
From: |
Stephen Leake |
Subject: |
Re: aborting a merge |
Date: |
Thu, 13 Feb 2020 11:32:19 -0800 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.2 (windows-nt) |
Hendrik Boom <address@hidden> writes:
> Let's say I do a propagate from a main branch to a development branch.
> I get dumped into emacs merge to sort things out.
> Let's further say the emacs merge gets too hairy. I need to do
> the merge more slowly with other tools, or perhaps start the merge
> over again, with more insight.
>
> How do I get out of emacs merge mode without letting monotone
> think the merge has been completed?
Don't save the buffer; that will tell monotone to abort.
--
-- Stephe
- aborting a merge, Hendrik Boom, 2020/02/13
- Re: aborting a merge,
Stephen Leake <=