The --force was not ideal, but given the small time window where we had a problem it seemed unlikely that anyone would have had major losses as a result. Hope it didn't cause any inconvenience.
On Wed, Jun 8, 2016 at 10:08 AM, Marko Rodriguez <[email protected]> wrote: > Hi, > > Stephen just forced commit his un-pulled version of tp31/. Phew…… git > revert would have been a nightmare given the number of commits. > > Both tp31/ and master/ seem to be back in shape. > > Thanks — (and sorry), > Marko. > > http://markorodriguez.com > > > > > On Jun 8, 2016, at 7:37 AM, Marko Rodriguez <[email protected]> > wrote: > > > > Hello, > > > > In a “da da” moment, I did “git rebase -v origin/master; git push” > instead of “git rebase -v origin/tp31; git push” … now tp31 is hosed. > Please don’t touch that branch till I figure out how to revert my mistake. > I’ll ping this thread once its all straightened out. > > > > Thanks, > > Marko. > > > > http://markorodriguez.com > > > > > > > >
