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 19:26:41 +0200 Message-ID: <55217051.5080109@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> <55213989.4090404@math.ntnu.no> <83h9sumvuo.fsf@gnu.org> 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 1428254835 12821 80.91.229.3 (5 Apr 2015 17:27:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:27:15 +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 19:27:07 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 1YeoK7-0001uD-W0 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:27:04 +0200 Original-Received: from localhost ([::1]:37133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoK7-0004qu-C4 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:27:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoJv-0004qc-0T for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:26:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeoJu-0005mk-5C for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:26:50 -0400 Original-Received: from hylle05.itea.ntnu.no ([129.241.56.225]:48685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoJp-0005mT-Hp; Sun, 05 Apr 2015 13:26:45 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 544F59010F6; Sun, 5 Apr 2015 19:26:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::9c03:cb99:4344:82bc] (unknown [IPv6:2001:4662:4ffb:0:9c03:cb99:4344:82bc]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 2ACEB9010F3; Sun, 5 Apr 2015 19:26:43 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83h9sumvuo.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.241.56.225 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:184937 Archived-At: Eli Zaretskii wrote: > > Thanks. The recommended workflow with branches is already described > on the Wiki, here: > > http://www.emacswiki.org/emacs/GitForEmacsDevs Right; I've been teaching grandmother to suck eggs. Sorry about that. > Feel free to suggest improvements for that, but other than that, I > think one workflow with branches should be enough for an introduction; > after that, people should find their own ways. I notice that you recommend merging master into the task branch, not the=20 other way around, as I indicated. Which is fine. But then we get to the =E2=80=9CMerging Into the Upstream Master=E2=80=9D= section, and=20 there I have some concerns. There you merge the task branch into a freshly updated master. Given=20 that you recently merged the other way, that merge could well be a=20 fast-forward, which is also fine. But then a little later, you do a=20 commit, but won't that usually fail, because you already have a clean=20 working directory? That is, after all, the result of a successful merge,=20 whether fast-forward or not. =E2=80=93 Harald