emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Marco Wahl <marcowahlsoft@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: Branch "next" garbled
Date: Wed, 03 Oct 2018 18:47:00 +0200	[thread overview]
Message-ID: <87h8i3nfjv.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <84ftxn45jn.fsf@gmail.com> (Marco Wahl's message of "Wed, 03 Oct 2018 13:45:48 +0200")

Hello,

Marco Wahl <marcowahlsoft@gmail.com> 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

next prev parent reply	other threads:[~2018-10-03 16:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-03 11:45 Branch "next" garbled Marco Wahl
2018-10-03 16:47 ` Nicolas Goaziou [this message]
2018-10-03 20:21   ` Marco Wahl
2018-10-12  1:44   ` Adrian Bradd
2018-10-12  3:17     ` Kaushal Modi
2018-10-03 20:46 ` Uwe Koloska

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87h8i3nfjv.fsf@nicolasgoaziou.fr \
    --to=mail@nicolasgoaziou.fr \
    --cc=emacs-orgmode@gnu.org \
    --cc=marcowahlsoft@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).