From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 10:07:26 -0400 Message-ID: References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1427810912 26925 80.91.229.3 (31 Mar 2015 14:08:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 14:08:32 +0000 (UTC) Cc: schwab@suse.de, stephen@xemacs.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 16:08:16 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ycwpe-0007sV-Gb for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 16:07:54 +0200 Original-Received: from localhost ([::1]:38861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycwpd-0007P7-SV for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 10:07:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcwpE-0007GT-Kt for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:07:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcwpD-0005PT-64 for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:07:28 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49347) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcwpD-0005PN-3l for emacs-devel@gnu.org; Tue, 31 Mar 2015 10:07:27 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YcwpC-0006ca-Jm; Tue, 31 Mar 2015 10:07:26 -0400 In-reply-to: <551A59F1.3060602@math.ntnu.no> (message from Harald Hanche-Olsen on Tue, 31 Mar 2015 10:25:21 +0200) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184630 Archived-At: [[[ 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 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.