From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Automatically marking conflicts are resolved Date: Tue, 07 Jan 2014 22:07:26 +0900 Message-ID: <871u0khre9.fsf@uwakimon.sk.tsukuba.ac.jp> 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=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1389100127 2775 80.91.229.3 (7 Jan 2014 13:08:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 13:08:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 14:08:53 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 1W0WOp-0007pM-LM for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 14:08:51 +0100 Original-Received: from localhost ([::1]:40607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0WOp-0006Th-59 for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 08:08:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0WOf-0006SD-UV for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:08:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0WOY-00046s-Hh for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:08:41 -0500 Original-Received: from mgmt2.sk.tsukuba.ac.jp ([130.158.97.224]:48099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0WOY-0003r7-7m for emacs-devel@gnu.org; Tue, 07 Jan 2014 08:08:34 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt2.sk.tsukuba.ac.jp (Postfix) with ESMTP id CD6D9970A39; Tue, 7 Jan 2014 22:07:26 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id C20CD1A2877; Tue, 7 Jan 2014 22:07:26 +0900 (JST) In-Reply-To: <87k3ec59yt.fsf@wanadoo.es> X-Mailer: VM undefined under 21.5 (beta34) "kale" 2a0f42961ed4 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 130.158.97.224 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:167600 Archived-At: =C3=93scar Fuentes writes: > I'm wary of using commits as temporary storage for work-in-progress > on merges or any other atomic change. A distraction at the wrong > moment may cause big trouble. I don't see how this can cause more trouble than any time a train of thought gets interrupted, and the developer incautiously proceeds to commit and push.