On Jul 9, 2013 7:55 AM, "Johannes Pfau" <nos...@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';
