www.digitalmars.com         C & C++   DMDScript  

D.gnu - gdc-4.8 branch

reply Johannes Pfau <nospam example.com> writes:
I wanted to update the gdc-4.8 branch and I surprisingly got many merge
conflicts. I think this is because we used rebase on the master branch
now and then.

So are there any gdc-4.8 specific commits in that branch or could I
just delete the branch and recreate it from master?

The github branch compare tool seems to be confused as well:
https://github.com/D-Programming-GDC/GDC/compare/gdc-4.8

Most of those commits are in master as well (with a different commit
id though, because of rebasing).
Jul 08 2013
parent Iain Buclaw <ibuclaw ubuntu.com> writes:
--20cf302ef9525c068d04e10f398b
Content-Type: text/plain; charset=ISO-8859-1

On Jul 9, 2013 7:55 AM, "Johannes Pfau" <nospam example.com> wrote:
 I wanted to update the gdc-4.8 branch and I surprisingly got many merge
 conflicts. I think this is because we used rebase on the master branch
 now and then.

 So are there any gdc-4.8 specific commits in that branch or could I
 just delete the branch and recreate it from master?

 The github branch compare tool seems to be confused as well:
 https://github.com/D-Programming-GDC/GDC/compare/gdc-4.8

 Most of those commits are in master as well (with a different commit
 id though, because of rebasing).

Github is too simple minded to understand cherry-pick. :) Don't mind what you do, though would rather get the unittester passing first. Regards -- Iain Buclaw *(p < e ? p++ : p) = (c & 0x0f) + '0'; --20cf302ef9525c068d04e10f398b Content-Type: text/html; charset=ISO-8859-1 <p>On Jul 9, 2013 7:55 AM, &quot;Johannes Pfau&quot; &lt;<a href="mailto:nospam example.com">nospam example.com</a>&gt; wrote:<br> &gt;<br> &gt; I wanted to update the gdc-4.8 branch and I surprisingly got many merge<br> &gt; conflicts. I think this is because we used rebase on the master branch<br> &gt; now and then.<br> &gt;<br> &gt; So are there any gdc-4.8 specific commits in that branch or could I<br> &gt; just delete the branch and recreate it from master?<br> &gt;<br> &gt; The github branch compare tool seems to be confused as well:<br> &gt; <a href="https://github.com/D-Programming-GDC/GDC/compare/gdc-4.8">https://github.com/D-Programming-GDC/GDC/compare/gdc-4.8</a><br> &gt;<br> &gt; Most of those commits are in master as well (with a different commit<br> &gt; id though, because of rebasing).</p> <p>Github is too simple minded to understand cherry-pick. :)</p> <p>Don&#39;t mind what you do, though would rather get the unittester passing first.<br></p> <p>Regards<br> -- <br> Iain Buclaw</p> <p>*(p &lt; e ? p++ : p) = (c &amp; 0x0f) + &#39;0&#39;;</p> --20cf302ef9525c068d04e10f398b--
Jul 09 2013