This is embarrassing ...
So I made the mistake of git pull on each branch (5.4/5/6/master) (without
--rebase) before pushing a small update tonight. So when I merged each
branch the merge commits from my pulls went into each branch when I pushed.
Basically I've spent a couple of hours trying to fix the problem with git
revert but it's extremely tedious and I seem to have made the problem
worse. Can someone with the appropriate karma please delete each of my
commits on 5.4, 5.5, 5.6 and master from Feb 18, 2014? It has turned into a
nightmare trying to fix this without rewriting history.
Sorry -- it won't happen again :/
This is embarrassing ...
So I made the mistake of git pull on each branch (5.4/5/6/master) (without
--rebase) before pushing a small update tonight. So when I merged each
branch the merge commits from my pulls went into each branch when I pushed.Basically I've spent a couple of hours trying to fix the problem with git
revert but it's extremely tedious and I seem to have made the problem
worse. Can someone with the appropriate karma please delete each of my
commits on 5.4, 5.5, 5.6 and master from Feb 18, 2014? It has turned into a
nightmare trying to fix this without rewriting history.Sorry -- it won't happen again :/
Hi,
Sure, I just git reset'ed each branch to the last commit before your merges.
Yeah, not allowing forced pushes means that not everybody can fix screwups
like this easily, but on the other side not everybody can risk losing
history from the repo if he/she screws up even more.
--
Ferenc Kovács
@Tyr43l - http://tyrael.hu
This is embarrassing ...
So I made the mistake of git pull on each branch (5.4/5/6/master) (without
--rebase) before pushing a small update tonight. So when I merged each
branch the merge commits from my pulls went into each branch when I
pushed.Basically I've spent a couple of hours trying to fix the problem with git
revert but it's extremely tedious and I seem to have made the problem
worse. Can someone with the appropriate karma please delete each of my
commits on 5.4, 5.5, 5.6 and master from Feb 18, 2014? It has turned into
a
nightmare trying to fix this without rewriting history.Sorry -- it won't happen again :/
Hi,
Sure, I just git reset'ed each branch to the last commit before your
merges.
Yeah, not allowing forced pushes means that not everybody can fix screwups
like this easily, but on the other side not everybody can risk losing
history from the repo if he/she screws up even more.--
Ferenc Kovács
@Tyr43l - http://tyrael.hu
I totally agree/understand. It would be too easy to really mess things up
with force karma. Thanks for fixing this one.