emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: VC mode and git


From: Richard Stallman
Subject: Re: VC mode and git
Date: Wed, 01 Apr 2015 06:22:19 -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. ]]]

  > > Neither is exactly true. Since 1.7.0 or so, "git pull" with uncommitted 
  > > changes can succeed if the newly pulled changes don't touch the locally 
  > > changed files, but will fail otherwise. Which makes a lot of sense.

  > Yes, and is expected.  Even CVS did that ;-)

With CVS, it would indicate the conflicts in those files,
and I only had to edit them to resolve the conflicts.
I do that by hand, since that way I know exactly what's going on
and I can do them in any order.

It seems that git handles this much worse.

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]