Please fix my git screw up
| From: | Daniel Lowrey | Date: | Wed, 19 Feb 2014 02:58:27 +0000 |
| Subject: | Please fix my git screw up | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-72693@lists.php.net to get a copy of this message | ||
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 :/