From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alf =?utf-8?q?H=C3=B8gemark?= <alf@i100.no> To: development@lists.ipfire.org Subject: Re: What is the process for suggesting bug fixes and improvements (bugtracker vs gitbug) ? Date: Tue, 11 Feb 2014 18:34:32 +0100 Message-ID: <52FA5F28.1080301@i100.no> In-Reply-To: <1391954463.21794.170.camel@rice-oxley.tremer.info> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3488038185769172279==" List-Id: <development.lists.ipfire.org> --===============3488038185769172279== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 --===============3488038185769172279==--