From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Automatically marking conflicts are resolved Date: Tue, 07 Jan 2014 14:06:49 +0100 Message-ID: <87fvp054ba.fsf@wanadoo.es> 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> <87eh4kq8bx.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389100032 1489 80.91.229.3 (7 Jan 2014 13:07:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 13:07:12 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 14:07:18 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 1W0WNJ-0004Yh-6h for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 14:07:17 +0100 Original-Received: from localhost ([::1]:40599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0WNI-00060p-O9 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 08:07:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0WNA-00060F-AM for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:07:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0WN4-0003ca-FB for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:07:08 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:57146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0WN3-0003cL-Nx for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:07:01 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0WN2-00040l-RT for emacs-devel@gnu.org; Tue, 07 Jan 2014 14:07:00 +0100 Original-Received: from 222.red-83-41-58.dynamicip.rima-tde.net ([83.41.58.222]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 14:07:00 +0100 Original-Received: from ofv by 222.red-83-41-58.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 07 Jan 2014 14:07:00 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 41 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 222.red-83-41-58.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:jizk6Yk7r2mW0+Y+i9yHjmiKJ9s= 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:167599 Archived-At: David Kastrup writes: >> 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. Availability + convenience is better than availability alone. >> 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. Apparently you are not familiarized with safety operational procedures, and you certainly don't know the workflow here, so your claim is baseless. >> 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, Here, a file is not "fixed" until the whole set of "fixes" passes the tests. > git add it, and it disappears from the diff This I want to avoid. When a merge contains conflicts, the diffs on the "Unstaged changes" section of Magit contains the conflicts and, eventually, my edits for resolving them. The non-conflicted files are on the "Staged changes" section. I find this convenient because it clearly separates the parts that required human intervention. > (which > shows the difference between index and work directory by default) > without affecting the state of the repository.