Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

From: Richard Stallman <[email-masked]>
Date: Wed, 22 Apr 2015 04:47:44 -0400

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > >> 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,

  > I've pushed this, together with the choosing logic suggested previously. 
  > Apparently it's the best we can do.

Could you describe the new behavior that you have implemented?

-- 
Dr Richard Stallman
President, Free Software Foundation
51 Franklin St
Boston MA 02110
USA
www.fsf.org  www.gnu.org
Skype: No way! See stallman.org/skype.html.