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: Sun, 05 Apr 2015 15:32:57 +0200 Message-ID: <55213989.4090404@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <55212DE9.8070806@math.ntnu.no> <83pp7in301.fsf@gnu.org> <55213473.9000703@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 1428240806 2142 80.91.229.3 (5 Apr 2015 13:33:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 13:33:26 +0000 (UTC) Cc: eggert@cs.ucla.edu, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 15:33:21 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 1Yekfx-0005a4-3f for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 15:33:21 +0200 Original-Received: from localhost ([::1]:36523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yekfw-00080Y-6E for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 09:33:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yekfj-00080H-QG for emacs-devel@gnu.org; Sun, 05 Apr 2015 09:33:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yekfj-0007Uc-0i for emacs-devel@gnu.org; Sun, 05 Apr 2015 09:33:07 -0400 Original-Received: from hylle06.itea.ntnu.no ([2001:700:300:3::235]:47258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yekff-0007UC-9a; Sun, 05 Apr 2015 09:33:03 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id D4CC7669F28; Sun, 5 Apr 2015 15:32:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [10.0.0.106] (248.69.202.84.customer.cdi.no [84.202.69.248]) (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 5E706663F98; Sun, 5 Apr 2015 15:32:59 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <55213473.9000703@math.ntnu.no> 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:184931 Archived-At: Harald Hanche-Olsen wrote: > Eli Zaretskii wrote: >> It also requires to use at least one more command ("git merge"), > > Yup. However, you will not encounter any difficulties arising from this > that you do't already encounter with =E2=80=9Cgit pull=E2=80=9D. To be specific, this is the workflow I had in mind: git checkout master # in case you're not already there git pull # to stay reasonably current git checkout -b hack master You are now on a branch called =E2=80=9Chack=E2=80=9D, which is a copy of= the master=20 branch. Hack away, commit as you see fit, and when all satisfied, push=20 it all by doing this: (If at this point you have uncommitted changes that you do not wish to=20 checkin yet, run =E2=80=9Cgit stash=E2=80=9D to put them aside.) git checkout master git pull git merge hack git push =E2=80=93 possibly pausing to fix any merge conflicts along the way. Once the merge and push have succeeded, you can delete the hack branch: git branch -d hack And if you had stashed some uncommited changes earlier, start over: git checkout -b hack master git stash pop # fix merge conflicts, if any, then continue hacking =E2=80=93 Harald