|
| From: | Stefan Monnier |
| Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
| Date: | Mon, 20 Apr 2015 21:06:01 -0400 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> Then my vote is for using "git add FILE" with conflicts during a
> merge, and "git reset HEAD FILE" with conflicts during "stash pop".
> I think this is the simplest solution and is easy to implement with
> minimal changes.
Fine by me,
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |