From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 17:05:08 +0200 Message-ID: <87617c3fq3.fsf@gmx.de> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <838uc8yd3c.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432825573 3579 80.91.229.3 (28 May 2015 15:06:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 15:06:13 +0000 (UTC) Cc: bruce.connor.am@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 17:06:03 2015 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 1YxzNg-0004SY-Vt for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 17:06:01 +0200 Original-Received: from localhost ([::1]:59473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzNg-0007aJ-DO for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 11:06:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzN1-0006fL-Kk for emacs-devel@gnu.org; Thu, 28 May 2015 11:05:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxzMt-0000AC-8M for emacs-devel@gnu.org; Thu, 28 May 2015 11:05:19 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:50274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzMs-00008R-V1; Thu, 28 May 2015 11:05:11 -0400 Original-Received: from detlef.gmx.de ([93.209.72.49]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0MTkNU-1YXcoP45QW-00QSpL; Thu, 28 May 2015 17:05:10 +0200 In-Reply-To: <838uc8yd3c.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 28 May 2015 17:46:15 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:KW0/9H+XiS2kNSM+fivymAevpwOvq/ZG6bJm2DJLLPRB+hAvZH/ XOV5pa8paqPGBhl2RyRlDTSUYfoJerH5upCq0N99TP2azsC1O7PWVCLB0/hhIOgqbt+tEDA Hu0AeyfHEFDroDVAqFuhoOaB1T8xbiasz8NatS1pG7NISYqGD1XPlVRtc6deJjD8ZBsqPf8 522pRDxhd67vmYRtTMi/Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:9+gwCl3Nuys=:KFdLNhoU6H097GfGjGQe9S oNgxzfhaAOtGhQ/hVKzvf5ZQgVMQLzuhl09j03P5o8Ew4hWPdhGaDd4P5zWTUWm9NmjiQKYmM mC85/LzWA5iYQP4GvggsUiZ8/TNEFzN5o3BQjFB7LMLUr2QZno3dl1+8Q4EV+t4yu0WrPxv17 ey5XOBfx2lWQGPh9rt2Es76FxiCQVtoJxPtaMVSlFfcLQEWDV/Vc46bt3yeXPcojW4ynPtFkB UJlCNN5N7Cac05B9EI10N8J8nlTKcD8/+zFqPVYIofdlBlda8QgJScngLd3/bfhe8I57p8wkz ijgbgf2Gk45CxlQtJt/V93mMSsiaFRXoOsBIjEGdrIaZZmkLwtdJadLpjE2dhkHBqnGN6AODb A3pZwJK7BR7tQ+1UId3RapbCb3BeRch/HDBHCiBFUzIfeGcxjOQiiwKBxDdS4C/YJZrWgTma/ 1gaBvA+XBHobRXGIBRYSe7ASa9E5gzltXEsYuADRHISbid3Zr9PkmdlYlkbGdQX8U94jOU1a+ OIsDjPAchwDkZi6BcNU+KqGo0Q9uybqlAD1RsGu/3tgRS+UBG5HPGQeDlOqhZcFW5ZxMRpS3P pGlvqnuL3swIMklNSxYc+MPZN7M70vUQr80pApxgvmg3teoHW1SqiOG3jul+KhMGUELZozEws qYij5qqJi9phJ4pBKBMettvEub7gOEcsWZ2mJHL2z7Q6HBs8l8nlimA8YX0o5wJK2iVo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.19 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:186907 Archived-At: Eli Zaretskii writes: >> As a general tip. Next time you try to pull and find out someone >> already has already done what you just did, don't resolve the merge >> conflict. Instead, abort the merge with `git merge --abort` (this will >> get you back to the state you had right before the pull), and then >> locally revert your commit. > > I don't see how this advice will be able to keep Michael out of > trouble next time. AFAICT, it will just get him in a different > situation, one that isn't simpler or safer to deal with. Locally > reverting commits risks losing them, for example. That's what I did, likely. However, the tip might give me a way to bring the git repo back to a stable state, with potential loosing of local changes. As long as I'm not fluent in solving merge conflicts, that's good to know. > OTOH, merge conflicts are nothing to be afraid of, the procedure to > handle them is simple and straightforward. Michael (and every one > else here) should IMO master that simple procedure, instead of > avoiding it. > > In a dVCS, you cannot rely on being able to avoid merges all the time > anyway. There are always races with other developers. If git would be more friendly to tell what happens ... why the hell I must take care on files I've never touched myself. Best regards, Michael.