From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marco Wahl <marcowahlsoft@gmail.com>
Subject: Re: Branch "next" garbled
Date: Wed, 03 Oct 2018 22:21:42 +0200
Message-ID: <84h8i2u6g9.fsf@gmail.com>
References: <84ftxn45jn.fsf@gmail.com> <87h8i3nfjv.fsf@nicolasgoaziou.fr>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49561)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1g7nei-0007fi-HQ
	for emacs-orgmode@gnu.org; Wed, 03 Oct 2018 16:22:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1g7neb-00080b-L5
	for emacs-orgmode@gnu.org; Wed, 03 Oct 2018 16:21:59 -0400
Received: from [195.159.176.226] (port=56930 helo=blaine.gmane.org)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <geo-emacs-orgmode@m.gmane.org>)
	id 1g7neb-0007yt-3H
	for emacs-orgmode@gnu.org; Wed, 03 Oct 2018 16:21:53 -0400
Received: from list by blaine.gmane.org with local (Exim 4.84_2)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1g7ncQ-0004Rx-8Q
	for emacs-orgmode@gnu.org; Wed, 03 Oct 2018 22:19:38 +0200
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode/>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: "Emacs-orgmode"
	<emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
To: emacs-orgmode@gnu.org

>> My git fu was not strong enough and so the "next" branch is a bit messy
>> right now.  (I tried to activate a local clean version of the "next"
>> branch.)

>> [...]

>> Can someone help to clean up the "next" branch, please?
>
> I think I cleaned it.

Thank you so much!

> To prevent further complications with this branch, I suggest to treat is
> like master and master like maint. I.e., every commit done in master is
> duplicated into next so that final merge is easier.

> WDYT?

This is a clear rule, which is easy to follow and easy to remember (at
least for me).  I love this!


Thanks and best regards,
                        Marco