From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: Branch "next" garbled Date: Wed, 03 Oct 2018 18:47:00 +0200 Message-ID: <87h8i3nfjv.fsf@nicolasgoaziou.fr> References: <84ftxn45jn.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7kIo-0003pa-4a for emacs-orgmode@gnu.org; Wed, 03 Oct 2018 12:47:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7kIi-0007kk-Ez for emacs-orgmode@gnu.org; Wed, 03 Oct 2018 12:47:10 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:58213) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g7kIg-0007jQ-TX for emacs-orgmode@gnu.org; Wed, 03 Oct 2018 12:47:03 -0400 In-Reply-To: <84ftxn45jn.fsf@gmail.com> (Marco Wahl's message of "Wed, 03 Oct 2018 13:45:48 +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" To: Marco Wahl Cc: emacs-orgmode@gnu.org Hello, Marco Wahl writes: > Hello fellow Orgers, > > This is more an internal issue about the repo and in particular the > "next" branch. > > 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.) > > I thought I could easily rollback the mess I created by going back to > the git node 3c8fd4fa7 which is the last git node before my activities. > > The command I used is > > git revert 3c8fd4fa7 > > Unfortunately this did not revert the repo to that node. > > Can someone help to clean up the "next" branch, please? I think I cleaned it. 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? Regards, -- Nicolas Goaziou