From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sun, 13 Sep 2015 09:42:55 +0300 Message-ID: <837fnubz0w.fsf@gnu.org> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1442126600 19221 80.91.229.3 (13 Sep 2015 06:43:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Sep 2015 06:43:20 +0000 (UTC) Cc: gscrivano@gnu.org, emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 13 08:43:11 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 1Zb10I-0005v2-8h for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 08:43:10 +0200 Original-Received: from localhost ([::1]:34713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb10H-00061X-Gw for ged-emacs-devel@m.gmane.org; Sun, 13 Sep 2015 02:43:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb10D-00060Y-Qv for emacs-devel@gnu.org; Sun, 13 Sep 2015 02:43:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zb108-00047l-Ri for emacs-devel@gnu.org; Sun, 13 Sep 2015 02:43:05 -0400 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:51045) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zb108-00047O-K4; Sun, 13 Sep 2015 02:43:00 -0400 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NUL00400RYEH800@mtaout28.012.net.il>; Sun, 13 Sep 2015 09:42:44 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUL00HXVRZ8N2B0@mtaout28.012.net.il>; Sun, 13 Sep 2015 09:42:44 +0300 (IDT) In-reply-to: <20150912203658.GA3711@acm.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.184 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:189883 Archived-At: > Date: Sat, 12 Sep 2015 20:36:58 +0000 > Cc: gscrivano@gnu.org, emacs-devel@gnu.org > From: Alan Mackenzie > > > So instead of rebasing we recommend just "git pull", which will merge > > the upstream changes with yours. > > I just did `git pull'. This didn't merge the upstream changes into > my repository. Instead it put the upstream file change into my working > directory, discarding the other contributer's change log. If I > understand correctly, that is. You must be misunderstanding, then, because "git pull" never does that kind of atrocities. > I think the best thing for me to do now is `git checkout ' to > revert that changed file, then `git pull --rebase' to get the change > again (and likely, quite a few others which have been done since), then > `git push' to get my change into savannah. Not sure this is the best way. But if you want to start from a clean slate, then this is the sequence of commands: git checkout git status If the last command says that only that your branch is ahead of origin/master, then continue: git pull If this causes merge conflicts, resolve them by editing and issuing "git add" for each file whose conflicts you resolved (Emacs should do this automatically when you save the file). Finally: git commit git pull git push The final "git pull" is for the slim chance that someone pushed to savannah while you were resolving the conflicts. If that pull produces conflicts (highly unlikely), repeat the whole process, and only then push.