From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 12:22:37 +0100 Organization: Organization?!? Message-ID: <87a93jeayq.fsf@fencepost.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> <83y4r3sdmh.fsf@gnu.org> <83tx1rscwy.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416655394 3251 80.91.229.3 (22 Nov 2014 11:23:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 11:23:14 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 12:23:07 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 1Xs8mR-0005oO-2q for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 12:23:07 +0100 Original-Received: from localhost ([::1]:45009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs8mQ-0002QZ-Fc for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 06:23:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs8mI-0002QB-8G for emacs-devel@gnu.org; Sat, 22 Nov 2014 06:23:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs8mC-0006OV-Az for emacs-devel@gnu.org; Sat, 22 Nov 2014 06:22:58 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:34964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs8mC-0006N0-3v for emacs-devel@gnu.org; Sat, 22 Nov 2014 06:22:52 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xs8m8-0005kn-JT for emacs-devel@gnu.org; Sat, 22 Nov 2014 12:22:48 +0100 Original-Received: from x2f4dbb5.dyn.telefonica.de ([2.244.219.181]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 22 Nov 2014 12:22:48 +0100 Original-Received: from dak by x2f4dbb5.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 22 Nov 2014 12:22:48 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 33 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f4dbb5.dyn.telefonica.de X-Face: 2FEFf>]>q>2iw=B6, xrUubRI>pR&Ml9=ao@P@i)L:\urd*t9M~y1^:+Y]'C0~{mAl`oQuAl \!3KEIp?*w`|bL5qr,H)LFO6Q=qx~iH4DN; i"; /yuIsqbLLCh/!U#X[S~(5eZ41to5f%E@'ELIi$t^ Vc\LWP@J5p^rst0+('>Er0=^1{]M9!p?&:\z]|;&=NP3AhB!B_bi^]Pfkw User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:3Hb4HtEAt7rCbYo891qdHAbk2Uk= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177995 Archived-At: Eli Zaretskii writes: >> Date: Sat, 22 Nov 2014 13:01:26 +0200 >> From: Eli Zaretskii >> Cc: emacs-devel@gnu.org >> >> > From: David Kastrup >> > Date: Sat, 22 Nov 2014 11:43:16 +0100 >> > >> > 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. > > What about non-content conflicts, though? AFAIK, smerge-mode doesn't > handle those, so "git add" might still be necessary? "git add" is definitely the main way to add a resolution to the index (though resolving a file changed in one branch and removed in another might instead be done using "git rm"). That using smerge-mode will save you from manually doing that is worth mentioning, but prescribing smerge-mode (and omitting mention of git add) rather than recommending its use is definitely overdoing it. -- David Kastrup