Hi Alf,
the different branches have the following purpose:
master: Is the branch with the code that is currently shipped (core update n).
next: The branch which is going to become the next release (core update n+1).
On top of that, we sometimes have feature branches.
Everything that is sent our way should be branched from and apply to next. There might be some occasions where master is also suitable, but next is the default.
Best, -Michael
On Tue, 2014-02-11 at 18:34 +0100, Alf Høgemark wrote:
On 02/09/2014 03:01 PM, Michael Tremer wrote:
Should I make an issue in the bug tracker for each of my pull requests ? Should I rather attach a patch to a bug tracker issue than issuing pull requests on github ?
Basically yes.
This might depend a little bit on what the changes include, but I think the bugtracker is the best option for most cases. You may still use your GitHub repository and point to the branch that should be pulled. A set of patches for each commit is also fine.
Could you give some information about what branches you use on git.ipfire.org ? http://git.ipfire.org/?p=ipfire-2.x.git;a=summary
I see the "next" branch, the "master" branch, "core75" branch and for example the "fifteen" branch. I haven't found information about that on the wiki. I would appreciate a few word about these branches.
Will 2.15 be "core76" ?
If I have some bug fixes for the current 2.13 core 75, what git branch should I work against ? The "core75" branch?
If I have some improvements that I think could maybe be part of 2.15, what git branch should I work against ?
Regards Alf