Re: Stash

[Richard Stallman <rms@gnu.org>]

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

  > > * cvs up indicates in a very visible way which files I have local changes in.

  > You mean, the "C" conflict marker?  Or do you mean something else?

Usually M because there are no conflicts.  Occasionally there is a
conflict so it says C.

  > >   What's more, if it mentions many other files, I can do cvs up again
  > >   immediately and see ONLY the files I have local changes in.

  > As I said, you need to use "git status" for that.  It will show the
  > same output if invoked repeatedly.

One more hassle of using Git.

  > > * cvs up will not "fail".  The worst that can happen is that some
  > >   file has a conflict, and if I don't bother with it immediately,
  > >   I will get reminded of it later.

  > Right, but this is unrelated to the display during "pull".

The point is that the output from pull is long and mostly meaningless,
so I didn't look at it at all.

  > Not sure what you allude to here.  Is that the diffstat display of the
  > amount of changes in each file?

That, and all the rest of the output.  It is verbose and doesn't tell
me anything useful, so I don't look at it.

  > > People said that git merge can fail for another reason (I forget
  > > what), not only because of conflicts.

  > I'm not aware of any, unless they meant uncommitted changes in the
  > same files that were changed upstream (which is covered on the Wiki
  > under "conflicts").

Yes, that was it.





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