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@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@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.