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: Wed, 01 Apr 2015 06:22:15 -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> <86384lciin.fsf@dod.no> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1427883761 1446 80.91.229.3 (1 Apr 2015 10:22:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 10:22:41 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 12:22:29 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 1YdFmz-00047v-U5 for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 12:22:26 +0200 Original-Received: from localhost ([::1]:49603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFmz-0002Rw-9d for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 06:22:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFmv-0002PZ-4Y for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdFmq-00046o-GA for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:21 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:53415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFmq-00046j-Du for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:16 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YdFmp-0007sk-2t; Wed, 01 Apr 2015 06:22:15 -0400 In-reply-to: <86384lciin.fsf@dod.no> (message from Steinar Bang on Tue, 31 Mar 2015 17:07:44 +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:184700 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. ]]] > > Reportedly pull includes merge, so this implies that git pull is also > > dangerous when you have made changes. > Dangerous in which way? I don't know. The git documentation says it can cause some sort of lossage, but was not specific. > If you get a conflict in the merge, git will not complete the commit > until the conflict is handled (much as any version control system). 1. Is that what happened to me? I've sent the output of several diagnostic commands; perhaps you can tell from them. 2. With CVS, merge conflicts are easy to handle -- just edit the file, look for the <<< and >>> that indicate conflicts, and fix up each one. Can I do it that way in Git? > If the pull merge affects any of the files you have uncommitted changes > in, then git refuses to merge (refuses to overwrite your local changes). 1. Is that what happened to me? I've sent the output of several diagnostic commands; perhaps you can tell from them. 2. If it doesn't show me the conflicts in the file, what can I do then? > You can do a pull. The simplest way to avoid most of the possible > conflicts would be to > git stash > git pull > git stash pop > before you commit. > But note that "git stash pop" can have conflicts, and git pull may have > conflicts (if you don't have any other local changes except your > uncommitted changes, ie. no local commits, then pull will never have > conflicts). Once again, what can I do if it has conflicts? -- 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.