From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier 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 15:02:13 -0400 Message-ID: References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <83bnh4ydci.fsf@gnu.org> <87a8wo3fyk.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432839757 21703 80.91.229.3 (28 May 2015 19:02:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 19:02:37 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 21:02:27 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 1Yy34T-0000WR-MU for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 21:02:25 +0200 Original-Received: from localhost ([::1]:60390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy34T-0006ty-5h for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 15:02:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy34Q-0006t1-Kz for emacs-devel@gnu.org; Thu, 28 May 2015 15:02:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yy34N-0002md-Ev for emacs-devel@gnu.org; Thu, 28 May 2015 15:02:22 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:35401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy34N-0002mX-A1; Thu, 28 May 2015 15:02:19 -0400 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t4SJ2Dgu019860; Thu, 28 May 2015 15:02:13 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id BEA97660D6; Thu, 28 May 2015 15:02:13 -0400 (EDT) In-Reply-To: <87a8wo3fyk.fsf@gmx.de> (Michael Albinus's message of "Thu, 28 May 2015 17:00:03 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5320=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5320> : inlines <3096> : streams <1446235> : uri <1942662> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:186930 Archived-At: > I try to use vc-dir as much as possible. At this step, several files > were marked as "edited", surprisingly. IIRC all files which were > reported between my two previous pull requests, while I did commit > tramp.el locally. That's to say the files, Stefan has repaired with Yes, it's something annoys me in other ways as well. When you do a "git pull" (or equivalent) when ends up being a merge rather than a fast-forward, you're basically adding the *other* branch's code to yours, so when there's a conflict it shows you that other code and those places where it conflicts with yours. Furthermore, it messes up the repository's "mainline". The way Git intends you to use it, you should basically never "commit+push" on the "master" branch. Instead you should do all development on some other branch, and then to push it to master, you need to do "checkout master; git pull; git merge ; git push" and if the push fails, you need to "git reset --soft HEAD^" and try again. I should sit down and write a "git update" command which would work like "git pull" but which pulls the current branch into the other branch instead of the other way around. Stefan