Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict

[Dmitry Gutov]

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.