Hi<br />
<br />
I have rebased all my changes, and made new pull requests on github.<br />
ll my pull requests are independent, I am not sure if that was wise,<br />
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.<br />
I think you should apply the pull request with the lower pull request
number first etc.<br />
<br />
I&#39;ve also added some info on <a
href="http://wiki.ipfire.org/en/development/git">http://wiki.ipfire.org/en/development/git</a>,
to reflect your comments about git branch usage.<br />
<br />
Regards<br />
Alf&nbsp;<br />
<br />
Den ons, februar 12, 2014, 21:09 skrev Michael Tremer:<br />
&gt; Hi,<br />
&gt;<br />
&gt; feel free to edit the wiki and add missing information.<br />
&gt;<br />
&gt; Those trivial changes don&#39;t need to be rebased.<br />
&gt;<br />
&gt; -Michael<br />
&gt;<br />
&gt; On Wed, 2014-02-12 at 20:49 +0100, Alf H&oslash;gemark wrote:<br />
&gt;&gt; Hi<br />
&gt;&gt; I will try to rebase my github pull requests to next branch
then.<br />
&gt;&gt; Thans for the info about the branches, it should probably be put
on wiki<br />
&gt;&gt; on development page.<br />
&gt;&gt;<br />
&gt;&gt; Alf<br />
&gt;&gt;<br />
&gt;&gt; Den 12. feb. 2014 kl. 20:04 skrev Michael Tremer<br />
&gt;&gt; &lt;michael.tremer@ipfire.org&gt;:<br />
&gt;&gt;<br />
&gt;&gt; &gt; Hi Alf,<br />
&gt;&gt; &gt;<br />
&gt;&gt; &gt; the different branches have the following purpose:<br />
&gt;&gt; &gt;<br />
&gt;&gt; &gt; master:<br />
&gt;&gt; &gt; Is the branch with the code that is currently shipped (core
update n).<br />
&gt;&gt; &gt;<br />
&gt;&gt; &gt; next:<br />
&gt;&gt; &gt; The branch which is going to become the next release (core
update<br />
&gt;&gt; n+1).<br />
&gt;&gt; &gt;<br />
&gt;&gt; &gt; On top of that, we sometimes have feature branches.<br />
&gt;&gt; &gt;<br />
&gt;&gt; &gt; Everything that is sent our way should be branched from and
apply to<br />
&gt;&gt; &gt; next. There might be some occasions where master is also
suitable, but<br />
&gt;&gt; &gt; next is the default.<br />
&gt;&gt; &gt;<br />
&nbsp;