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

From: Bastien <bzg@gnu.org>
To: Timothy <tecosaur@gmail.com>
Cc: Org Mode List <emacs-orgmode@gnu.org>
Subject: Re: Org branches: master, main, and maint?
Date: Sun, 26 Sep 2021 12:31:18 +0200	[thread overview]
Message-ID: <87ee9bbpc9.fsf@gnu.org> (raw)
In-Reply-To: <87k0j3eir3.fsf@gmail.com> (Timothy's message of "Sun, 26 Sep 2021 18:21:42 +0800")

Hi Timothy,

Timothy <tecosaur@gmail.com> writes:

> I’ve just had a look at the branches, and I see that we currently
> have
>
>     master
>     main
>     maint

Nope, the official source repository contains 

- main : the development branch (aka the old "master")
- bugfix : the bugfix branch (aka the old "maint")
- km/from-master-emacs : the branch to help with Emacs sync

> My previous impression was that master was the main development
> branch, and maint was for testing (though I wasn’t 100% sure).
> However now there’s master, main, and maint I’m feeling a bit unsure
> of what exactly is going on.
>
> A clarification would be much appreciated 🙂.

You probably listed your local branch with "git branch -a" or by
checking your .git/config file.  

If you clone a fresh repo like this:

~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git

and fetch all the branches (git fetch --all) you should only see
the three branches mentioned above.

Also, you can now forget code.orgmode.org, I've prevented any
push there.

HTH,

-- 
 Bastien

next prev parent reply	other threads:[~2021-09-26 10:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-26 10:21 Org branches: master, main, and maint? Timothy
2021-09-26 10:31 ` Bastien [this message]
2021-09-26 10:47   ` Timothy
2021-09-26 11:36   ` Max Nikulin
2021-09-26 19:46     ` Samuel Wales

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=87ee9bbpc9.fsf@gnu.org \
    --to=bzg@gnu.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=tecosaur@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).