From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Thu, 26 Mar 2015 13:16:09 +0100 Message-ID: <5513F889.4000404@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427372189 17674 80.91.229.3 (26 Mar 2015 12:16:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 12:16:29 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 13:16:29 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 1Yb6i3-0001ZQ-Oc for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 13:16:27 +0100 Original-Received: from localhost ([::1]:44237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb6i2-0005o4-PF for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 08:16:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb6hw-0005nr-PG for emacs-devel@gnu.org; Thu, 26 Mar 2015 08:16:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb6hs-0002hQ-4b for emacs-devel@gnu.org; Thu, 26 Mar 2015 08:16:20 -0400 Original-Received: from hylle06.itea.ntnu.no ([2001:700:300:3::235]:35660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb6hr-0002gq-UC; Thu, 26 Mar 2015 08:16:16 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 7685E669C32; Thu, 26 Mar 2015 13:16:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [IPv6:2001:700:300:1470:789b:1233:a9df:9367] (unknown [IPv6:2001:700:300:1470:789b:1233:a9df:9367]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 21BB56697FB; Thu, 26 Mar 2015 13:16:12 +0100 (CET) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::235 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:184320 Archived-At: I have a few more minutes. Here is a rough outline of a course of=20 action. It is good if someone else is willing to review these suggestions= . Run =E2=80=9Cgit diff -- lisp/ChangeLog=E2=80=9D. If the output looks sane, run git add lisp/ChangeLog git commit But don't try to push it yet! That will fail. Run: git checkout -b badmerge git checkout master git reset --hard origin/master git checkout -b rms dca743f0941909a80e3f28c023977120b6203e20 Now, if all that went well, your master branch is back in sync with the=20 remote, you have the result of your bad merge in the badmerge branch,=20 and you have your latest good commit on the rms branch. If I have understood correctly, only your changes to lisp/ChangeLog are=20 now missing from the rms branch. To fix that, do git checkout badmerge # copy your additions to lisp/ChangeLog and save them somewhere safe git checkout rms # edit lisp/ChangeLog, putting in your additions git commit -a # or just use C-x v v Now all your local changes are safely in the =E2=80=9Crms=E2=80=9D branch= . If all is well so far, you need to update your master branch: git checkout master git pull --ff-only And now you can do one of two things: One is (assuming you're still on master) git merge rms git push And if all is well, you're done! You may now wish to clean up by removing the badmerge and rms branches. If you have merge conflicts, DON'T ever use C-x v v after resolving=20 conflicts in a single file. Instead, just do git add on the files as you=20 are fixing them, and commit when done with all of them. An alternative route is to rebase your rms base on the current tip of=20 the master branch, but that is beyond my experience. =E2=80=93 Harald