Re: Org branches: master, main, and maint?

2021-09-26 Thread Samuel Wales
i have forgotten all my non-basic git, so i guess i am in for a bunch of figuring out the automatic rebase of my stuff on top of upstream. perhaps i can do a single git clone, do the rebase, and then change branches to create the ohters. but i presume this is a normal git thing git clone to get

Re: Org branches: master, main, and maint?

2021-09-26 Thread Max Nikulin
On 26/09/2021 17:31, Bastien wrote: Timothy writes: I’ve just had a look at the branches, and I see that we currently have master main maint 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:

Re: Org branches: master, main, and maint?

2021-09-26 Thread Timothy
Hi Bastien, > 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 > > and fetch all the branches (git fetch –all) you should only see >

Re: Org branches: master, main, and maint?

2021-09-26 Thread Bastien
Hi Timothy, Timothy 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")

Org branches: master, main, and maint?

2021-09-26 Thread Timothy
Hello, I’ve just had a look at the branches, and I see that we currently have ⁃ master ⁃ main ⁃ maint 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