emacs-devel
[Top][All Lists]
Advanced

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

Re: Merge conflict cookie in dired.el (current HEAD in bzr)


From: Paul Eggert
Subject: Re: Merge conflict cookie in dired.el (current HEAD in bzr)
Date: Fri, 28 Sep 2012 11:15:22 -0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1

On 09/28/2012 08:30 AM, Juri Linkov wrote:
> When "bzr merge" says there are conflicts,
> I rush to edit reported files to fix conflicts

Eeuuw.  Don't do that!  The right way to think about
'bzr' is that it's a good time to get a cup of coffee.
Or tea.  Or think.  Or maybe just look out the window, if
you have a window.  But don't modify source files while
'bzr' is doing its thing -- that'll just cause trouble.

I often get some of my best little hacking ideas
while waiting for bzr to finish.



reply via email to

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