On Tue, 24 May 2016, Satish Balay wrote: > On Tue, 24 May 2016, Jed Brown wrote:
> > I would be in favor of either rewinding 'next' or reverting all of > > Mark's stuff (if you can identify well enough), then rebasing his branch > > so it's not such a mess. > > Its easy enough for me to rewind next. All in 'integrator group' would > have to delete/fetch/recreate 'next' branch in their clones - thats > the difficult part of rewinding next.. > > I should perhaps lock 'next' for some time when I rewind it.. [and > then unlock gradually as folks confirm they deleted 'next' from their > local clones..] Mark, I've recreated next. So you can cleanup(rebase over master, squash/modify commits) mark/snes-ex56c as required. You might also want to delete mark/snes-ex56b - since its no longer required. Thanks, Satish
