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: Automatically marking conflicts are resolved Date: Tue, 07 Jan 2014 13:34:26 +0100 Organization: Organization?!? Message-ID: <87eh4kq8bx.fsf@fencepost.gnu.org> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <871u0k7q9f.fsf@wanadoo.es> <87sit063ta.fsf_-_@wanadoo.es> <87ha9gtyds.fsf@fencepost.gnu.org> <87ob3o62co.fsf@wanadoo.es> <878uustcmo.fsf@fencepost.gnu.org> <87k3ec59yt.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1389098120 12126 80.91.229.3 (7 Jan 2014 12:35:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 12:35:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 13:35:26 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 1W0VsS-0007NY-W6 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 13:35:25 +0100 Original-Received: from localhost ([::1]:40297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0VsS-0000Dq-J3 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 07:35:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Vrq-0007xX-KN for emacs-devel@gnu.org; Tue, 07 Jan 2014 07:34:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0Vrj-0002Jd-4B for emacs-devel@gnu.org; Tue, 07 Jan 2014 07:34:46 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:36177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Vri-0002JS-Hz for emacs-devel@gnu.org; Tue, 07 Jan 2014 07:34:38 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0Vrh-0005YC-0W for emacs-devel@gnu.org; Tue, 07 Jan 2014 13:34:37 +0100 Original-Received: from x2f4af83.dyn.telefonica.de ([2.244.175.131]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 13:34:37 +0100 Original-Received: from dak by x2f4af83.dyn.telefonica.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 13:34:37 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 38 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: x2f4af83.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/24.3.50 (gnu/linux) Cancel-Lock: sha1:f/3Sur1nznEnAtpGMtCPoAH2nc4= 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:167597 Archived-At: Óscar Fuentes writes: > David Kastrup writes: > >>> That's not enough and too late. I wont commit the merge without testing >>> it first and meanwhile a clear separation of conflicted areas is useful. >> >> Uh, why would that be too late? Before committing the merge, git diff >> lists all merge conflicts. After committing the merge, the information >> is in the commit message. The commit can still be amended. >> >> Whether or not you choose to commit first, test later (after all, a >> commit is not the same as an upstream push and can always be amended) or >> test first, commit later, the information is readily available. > > I'm wary of using commits as temporary storage for work-in-progress on > merges or any other atomic change. So what? I repeat: at no point of time does the information become unavailable. > A distraction at the wrong moment may cause big trouble. There is a > policy here that says that, except for experimental throw-away > projects, all changes must pass some tests before committing them. You are confused. A "policy" cannot cover what may be _committed_ since commits are private to each user. A policy can only cover what is _pushed_ to a central resource. > Also it is convenient to have the diff updated as you work on fixing > the merge, with the merge-specific diff indicators. So what? Fix a file, git add it, and it disappears from the diff (which shows the difference between index and work directory by default) without affecting the state of the repository. -- David Kastrup