To fix that locally I would reset to a safe commit and then cherry pick any "real" commits thereafter. Not sure how to proceed with public branches though.
On 12 July 2014 15:06, Dalai Felinto <[email protected]> wrote: > Hi, > > >From the look of bf-cvs and the tracker it seems something went wrong in > recent commit from soc-2013-paint. Basically some master commits showed up > as commits (with new hashes) in the branch (triggering new emails in bf-cvs > and adding new related commits to already closed bug reports). > > Is that normal? It's the first time I see this. It seems that either rebase > was used or the merge went wrong. > > Cheers, > Dalai > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
