[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Error in BZR Wiki document?
|
From: |
Stefan Monnier |
|
Subject: |
Re: Error in BZR Wiki document? |
|
Date: |
Tue, 05 Jan 2010 10:45:55 -0500 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) |
> I think that when you open a conflicted file on Emacs, it activates
> SMerge and after you remove the conflict text markers and save the
> file, SMerge automatically does a `bzr resolve'.
Indeed, except it's VC which does it, not SMerge.
>> What is bzr resolve supposed to do anyway?
> It prevents you from committing a conflicted file.
Or rather Bzr prevents you from committing a conflicted file, so you
have to tell it when you're resolved a conflict.
Stefan