[Top][All Lists]

[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: Tue, 31 Mar 2015 10:07:26 -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. ]]]

  > If you say so. But then why do we see this warning from “git help merge”?

  >         Warning: Running git merge with non-trivial
  >         uncommitted changes is discouraged: while possible,
  >         it may leave you in a state that is hard to back out
  >         of in the case of a conflict.

Reportedly pull includes merge, so this implies that git pull is also
dangerous when you have made changes.

It usually takes weeks from when I write a change to when I check it
in to Savannah.  To check them in, I must first get the latest changes
from Savannah.  If I can't do a pull in that state, how can I ever
check them in?

(I am using the term "check in" to mean "put my changes into the
central repository".  How this breaks down into git operations is
implementation details.  I would rather not have to know the details,
but if git makes it necessary for me to know them, I will still think
of what I am doing as "check in" despite the cumbersome technicalities
required to carry it out.)

Dr Richard Stallman
President, Free Software Foundation
51 Franklin St
Boston MA 02110
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]