From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: IMPORTANT: Back to the two-branches git workflow Date: Sat, 21 Apr 2012 12:58:59 +0200 Message-ID: <87k419z6z0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:50820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLY2z-0008So-DY for emacs-orgmode@gnu.org; Sat, 21 Apr 2012 07:00:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SLY2x-0006v3-OB for emacs-orgmode@gnu.org; Sat, 21 Apr 2012 07:00:08 -0400 Received: from plane.gmane.org ([80.91.229.3]:42778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLY2x-0006ty-Ha for emacs-orgmode@gnu.org; Sat, 21 Apr 2012 07:00:07 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SLY2u-0008R3-Bq for emacs-orgmode@gnu.org; Sat, 21 Apr 2012 13:00:04 +0200 Received: from pha75-11-82-236-86-204.fbx.proxad.net ([82.236.86.204]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 Apr 2012 13:00:04 +0200 Received: from bzg by pha75-11-82-236-86-204.fbx.proxad.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 Apr 2012 13:00:04 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Hi all, The one-month time frame for experimenting with the 3-branches git workflow is over and I decided to go back to the 2-branches model, using maint and master as we did before. Fixes go to maint and development goes to master. Here are the reasons: - The solution for doing the right thing while merging is not to multiply branches, but to clearly know whether you have to work on a private branch vs. a public one. The blog recently sent by Nick was very convincing wrt this, and it helped me understand Achim's advice to *never* commit directly on a public branch. - The two-way Emacs<>Org syncing is not easier with 3 branches than it is with 2-branches. - Using a dedicated branch for releases is not *that* useful. Releasing using git hooks is not such a good idea: releasing from the server is simple enough. So I deleted the hotfix-7.8.06 branch. I cherry-picked useful fixes from there to the maint branch, which is now ahead of release_7.8.09 by a few commits and will be where I will release 7.8.10 from. Please do not rely on this branch anymore and update your refs with ~$ git remote update Thanks everyone to bare with me! Best, -- Bastien