From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: What is the process for suggesting bug fixes and improvements
 (bugtracker vs gitbug) ?
Date: Mon, 17 Feb 2014 17:28:32 +0100
Message-ID: <1392654512.30526.43.camel@rice-oxley.tremer.info>
In-Reply-To: <aa65d969e7d74d3aaafea9e8fbff05c2.squirrel@webmail.mailadmin.no>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3444414572862902385=="
List-Id: <development.lists.ipfire.org>

--===============3444414572862902385==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Hi,

thanks.

I merged the language fixes and HTML cleanup commits and had to resolve
some minor merge conflicts. No big deal.

On Sun, 2014-02-16 at 07:17 +0100, alf(a)i100.no wrote:
> Hi
> 
> I have rebased all my changes, and made new pull requests on github.
> ll my pull requests are independent, I am not sure if that was wise,
> you might get some conflicts when you have applied some pull requests,
> and then try to apply the last ones. Let me know, and I can rebase.
> I think you should apply the pull request with the lower pull request
> number first etc.
> 
> I've also added some info on
> http://wiki.ipfire.org/en/development/git, to reflect your comments
> about git branch usage.

Great. Whenever you feel that something is missing and you cannot find
it in the English version of the wiki, please add it :)

-Michael

> 
> Regards
> Alf 
> 
> Den ons, februar 12, 2014, 21:09 skrev Michael Tremer:
> > Hi,
> >
> > feel free to edit the wiki and add missing information.
> >
> > Those trivial changes don't need to be rebased.
> >
> > -Michael
> >
> > On Wed, 2014-02-12 at 20:49 +0100, Alf Høgemark wrote:
> >> Hi
> >> I will try to rebase my github pull requests to next branch then.
> >> Thans for the info about the branches, it should probably be put on
> wiki
> >> on development page.
> >>
> >> Alf
> >>
> >> Den 12. feb. 2014 kl. 20:04 skrev Michael Tremer
> >> <michael.tremer(a)ipfire.org>:
> >>
> >> > 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.
> >> >
>  


--===============3444414572862902385==--