Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:72694
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAH8Mpnn82GTFfR2McMBHxust7Nzf=RfU_XJLwOP0ofeKiXpgMQ@mail.gmail.com>
References: <CAH8Mpnn82GTFfR2McMBHxust7Nzf=RfU_XJLwOP0ofeKiXpgMQ@mail.gmail.com>
Date: Wed, 19 Feb 2014 08:53:31 +0100
Message-ID: <CAH-PCH4+7GmSWSmkLwT4sqBuadsvRgLiEHDmhjANhy9dNq-B4Q@mail.gmail.com>
To: Daniel Lowrey <rdlowrey@gmail.com>
Cc: "internals@lists.php.net" <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=001a11c004345b063504f2bdaf1b
Subject: Re: [PHP-DEV] Please fix my git screw up
From: tyra3l@gmail.com (Ferenc Kovacs)

--001a11c004345b063504f2bdaf1b
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Wed, Feb 19, 2014 at 3:58 AM, Daniel Lowrey <rdlowrey@gmail.com> wrote:

> This is embarrassing ...
>
> So I made the mistake of git pull on each branch (5.4/5/6/master) (withou=
t
> --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 pushe=
d.
>
> 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.

--=20
Ferenc Kov=C3=A1cs
@Tyr43l - http://tyrael.hu

--001a11c004345b063504f2bdaf1b--