[Top][All Lists]

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

Re: git is screwed

From: Steinar Bang
Subject: Re: git is screwed
Date: Thu, 26 Mar 2015 20:02:58 +0100
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt)

>>>>> Eli Zaretskii <address@hidden>:

> What's wrong with smerge-mode?

I haven't tried it yet.  I just heard about it 24 days ago (the thread
"smerge-mode is fantastic, but it annoys me").

> It should kick in automatically when you have conflict markers,

Um... since when...?  24.4?  Or git master HEAD?

> and also invoke "git add" automatically for every file saved after
> resolving all of its conflicts.

Is that configurable?  It sounds like a step I would like to control

reply via email to

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