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: VC mode and git Date: Sun, 05 Apr 2015 18:35:27 +0300 Message-ID: <83h9sumvuo.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1428248160 11568 80.91.229.3 (5 Apr 2015 15:36:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 15:36:00 +0000 (UTC) Cc: eggert@cs.ucla.edu, rms@gnu.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 17:35:49 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 1YemaS-0004kQ-IU for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 17:35:48 +0200 Original-Received: from localhost ([::1]:36785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YemaR-0007oK-Kc for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 11:35:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YemaB-0007oF-GD for emacs-devel@gnu.org; Sun, 05 Apr 2015 11:35:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yema7-0001ca-3E for emacs-devel@gnu.org; Sun, 05 Apr 2015 11:35:31 -0400 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:58830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yema6-0001cL-Li; Sun, 05 Apr 2015 11:35:26 -0400 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NMC00700B26MY00@mtaout28.012.net.il>; Sun, 05 Apr 2015 18:34:07 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC0008RB8VXI60@mtaout28.012.net.il>; Sun, 05 Apr 2015 18:34:07 +0300 (IDT) In-reply-to: <55213989.4090404@math.ntnu.no> 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:184934 Archived-At: > Date: Sun, 05 Apr 2015 15:32:57 +0200 > From: Harald Hanche-Olsen > CC: rms@gnu.org, eggert@cs.ucla.edu, emacs-devel@gnu.org >=20 > 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 fro= m this > > that you do't already encounter with =E2=80=9Cgit pull=E2=80=9D. >=20 > To be specific, this is the workflow I had in mind: Thanks. The recommended workflow with branches is already described on the Wiki, here: http://www.emacswiki.org/emacs/GitForEmacsDevs 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.