On 16/12/16 15:24, Raffaele Viglianti wrote:
"Behind" indicates how many commits are in the dev that are not in the current branch, and "ahead" indicates how many commits are in the current branch that are not in dev.
Hi Raff, That was my understanding but for some reason the att.global.source branch, that I've now deleted and so can't show you, was saying it was 5 commits ahead of dev, but those commits were all the work that I'd done on it including the last one where I'd forgotten to put predeclare="true" on the classSpec. But when I look at dev all of those changes were merged in perfectly fine. i.e. https://github.com/TEIC/TEI/blob/dev/P5/Source/Specs/att.global.source.xml#L... has the predeclare="true" in it. But it was still saying it was 5 commits ahead because of these. You see why I'm confused, right? -James -- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford