Re: [Mixxx-devel] GIT etiquette
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. 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 etiquette rule we have, is not to rebase if a review is in > progress. > > Thank you for picking up a bug. > > Kind regards, > > Daniel > > > Am 22.09.2018 um 13:12 schrieb javier.vilarr...@gmail.com: > > Hi. > > > > Just a fast question. > > > > Any etiquette rule on how to name GIT branches? > > > > And from where to branch? I mean, the bug I want to work on has > > been > > assigned to milestone 2.3.0. Do I branch from master or do I branch > > from somewhere else? > > > > Thanks in advance :) > > > > Javi > > > > > > > > ___ > > Get Mixxx, the #1 Free MP3 DJ Mixing software Today > > http://mixxx.org > > > > > > Mixxx-devel mailing list > > Mixxx-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/mixxx-devel > > > > > ___ > Get Mixxx, the #1 Free MP3 DJ Mixing software Today > http://mixxx.org > > > Mixxx-devel mailing list > Mixxx-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/mixxx-devel ___ Get Mixxx, the #1 Free MP3 DJ Mixing software Today http://mixxx.org Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
Re: [Mixxx-devel] GIT etiquette
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 etiquette rule we have, is not to rebase if a review is in progress. Thank you for picking up a bug. Kind regards, Daniel Am 22.09.2018 um 13:12 schrieb javier.vilarr...@gmail.com: Hi. Just a fast question. Any etiquette rule on how to name GIT branches? And from where to branch? I mean, the bug I want to work on has been assigned to milestone 2.3.0. Do I branch from master or do I branch from somewhere else? Thanks in advance :) Javi ___ Get Mixxx, the #1 Free MP3 DJ Mixing software Today http://mixxx.org Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel ___ Get Mixxx, the #1 Free MP3 DJ Mixing software Today http://mixxx.org Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
Re: [Mixxx-devel] GIT etiquette
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 has already been cut from master. On Sat, Sep 22, 2018, 4:12 AM wrote: > Hi. > > Just a fast question. > > Any etiquette rule on how to name GIT branches? > > And from where to branch? I mean, the bug I want to work on has been > assigned to milestone 2.3.0. Do I branch from master or do I branch > from somewhere else? > > Thanks in advance :) > > Javi > > > > ___ > Get Mixxx, the #1 Free MP3 DJ Mixing software Today > http://mixxx.org > > > Mixxx-devel mailing list > Mixxx-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/mixxx-devel > ___ Get Mixxx, the #1 Free MP3 DJ Mixing software Today http://mixxx.org Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
