Re: [Mixxx-devel] GIT etiquette

2018-09-24 Thread javier . vilarroig
Thanks for the answers :) New to GIT, so not sure what is a rebase ;) Cheers El dom, 23-09-2018 a las 00:52 +0200, Daniel Schürmann escribió: > Hi Javi, > > you can call you branch as you like. > > In general you should branch from the HEAD of the lowest effected > branch > if unsure.

Re: [Mixxx-devel] GIT etiquette

2018-09-22 Thread Daniel Schürmann
Hi Javi, you can call you branch as you like. In general you should branch from the HEAD of the lowest effected branch if unsure. This way we can finally decide just before merge in which branch the bug should go. If it is obvious that it will go to 2.3, you can branch from master. The only

Re: [Mixxx-devel] GIT etiquette

2018-09-22 Thread RJ Skerry-Ryan
Hi! We name release branches and tags specifically, but you can name your own branches whatever you like :). It's nice if they have a descriptive name like "fix-foo-bug". For 2.3.0, there is no release branch yet so you would branch from master. For 2.2.0, branch from the "2.2" branch since it