[Top][All Lists]

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

Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when

From: Dmitry Gutov
Subject: Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict
Date: Mon, 20 Apr 2015 18:54:45 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0

On 04/20/2015 06:25 PM, Stefan Monnier wrote:

So I think
that looking for "\\`M" in the output of "git status --porcelain"
should work.

I see

$ git status --porcelain
UU test2

in both cases of stash-related conflict.

Haven't time to test what happens during the usual merge operation.

Well, if you're not afraid of getting gross, you could do something
along the lines of:

    unstaged=$(git diff -- <file>)
    git add <file>
    echo "$unstaged" | patch -R -p1
    git add <file>
    echo "$unstaged" | patch -p1

Ehh, I considered something like this, but it looks brittle. A failure in one of the middle steps means the user loses their edits.

reply via email to

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