From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 13:01:26 +0200 Message-ID: <83y4r3sdmh.fsf@gnu.org> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> <831tovttmk.fsf@gnu.org> <87egsvecsb.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416654122 18313 80.91.229.3 (22 Nov 2014 11:02:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 11:02:02 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 12:01:55 2014 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 1Xs8Ru-00084R-EX for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 12:01:54 +0100 Original-Received: from localhost ([::1]:44955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs8Rt-0005HI-Va for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 06:01:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs8Rc-0005HB-E1 for emacs-devel@gnu.org; Sat, 22 Nov 2014 06:01:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs8RW-0000Q9-FS for emacs-devel@gnu.org; Sat, 22 Nov 2014 06:01:36 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:36787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs8RQ-0000Oh-14; Sat, 22 Nov 2014 06:01:24 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NFF00300S70JZ00@mtaout25.012.net.il>; Sat, 22 Nov 2014 12:57:00 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFF001S9T303940@mtaout25.012.net.il>; Sat, 22 Nov 2014 12:57:00 +0200 (IST) In-reply-to: <87egsvecsb.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:177989 Archived-At: > From: David Kastrup > Date: Sat, 22 Nov 2014 11:43:16 +0100 > > > git merge master > > # resolve conflicts > > git commit -a -m "Merge from mainline." > > > > Is that correct? > > I doubt that it works. At any rate, Git does not distinguish between a > file with merge conflict markers and one without merge conflict markers > (which are valid file contents, after all). > > It records unresolved conflicts in the index where they are overwritten > when doing git-add. I haven't checked whether git commit -a will > actually overwrite a conflicted index. If it does, we don't want to > recommend that error-prone workflow which is likely to record files with > unresolved conflicts as resolved. If it doesn't, git commit -a will not > help. smerge-mode, incidentally, adds the file in question > automatically anyway after all conflicts are resolved. So if "# resolve > conflicts" implies use of smerge-mode, just git commit should be enough. Ah, okay, so we should mention smerge-mode there. Thanks.