Re: VC mode and git

[Richard Stallman]

[[[ 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. ]]]

  > The only way to make git do the merge is to move away the uncommitted
  > changes, either by committing them, or by stashing them.

  > So to get out of the unpullable situation one either have to keep
  > committing changesets (and try a pull), or do
  >  git stash
  >  git pull
  >  git stash pop

  > (unfortunately the "git stash pop" may also have a conflict, and getting
  > out of fixing the conflict without committing, is sort-of-advanced git,

I am not sure what the last sentence means.  Suppose git stash pop
reports a conflict.  Suppose I am willing to fix the conflict right
then, but I don't want to commit all those changes now (because some
should not be installed).  Is that straightforward to do?

If so, how?

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