|
| From: | Stefan Monnier |
| Subject: | Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict |
| Date: | Mon, 20 Apr 2015 15:39:58 -0400 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> Ehh, I considered something like this, but it looks brittle. A failure in
> one of the middle steps means the user loses their edits.
Yes, it's hideous. We should report it as a Git bug.
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |