emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Workflow to accumulate individual changes?


From: Juanma Barranquero
Subject: Re: Workflow to accumulate individual changes?
Date: Sat, 2 Jan 2010 14:20:37 +0100

On Sat, Jan 2, 2010 at 10:11, Eli Zaretskii <address@hidden> wrote:

> Why is "bzr status" above important?

It shouldn't be needed, though it seems sensible to do it before
switching your tree...

> what happens if I do have pending
> changes before switching?

They get merged:

  [...] the working tree is updated and uncommitted changes
  are merged. The user can commit or revert these as they desire.

  Pending merges need to be committed or reverted before using switch.

Conflicts are marked as expected.

    Juanma




reply via email to

[Prev in Thread] Current Thread [Next in Thread]