Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:72695 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 67561 invoked from network); 19 Feb 2014 10:34:26 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 19 Feb 2014 10:34:26 -0000 Authentication-Results: pb1.pair.com smtp.mail=rdlowrey@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=rdlowrey@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.223.174 as permitted sender) X-PHP-List-Original-Sender: rdlowrey@gmail.com X-Host-Fingerprint: 209.85.223.174 mail-ie0-f174.google.com Received: from [209.85.223.174] ([209.85.223.174:50765] helo=mail-ie0-f174.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id CC/A3-37047-1B884035 for ; Wed, 19 Feb 2014 05:34:26 -0500 Received: by mail-ie0-f174.google.com with SMTP id as1so104248iec.5 for ; Wed, 19 Feb 2014 02:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=nEHqSPbWgdYhF6Z+8HRmMU5kcYfCtXKPmbosie7GzYk=; b=bNojUgB2ZHXVxAa9Q4GRu9e9oUD6Qf/H+8A1p+HiEr4cnfAjHoTasvIDz11Gvok3ms KxHjiJRSnSUqkdm5M92HfqGqmLVQW8hO5dum8oKfuSsZMZOfyiaHkp2mXXWQdYF5RdAT r6ljK4ymMPz5RLbjJpe4rqukfli38C+kfOp1dlDPmk4M8/sKiXSPgiN9u1Yz8nHuTW/k OEHEf9nUf9a7UdPZP2BU7Epi3lBAVQk6qqga5pmyrfSYXVTIwk2rCVe6wvWCx+9Ik56j 6s6GGHlIoyHWsYOpWhH7iawZUXOADi96yyewuPI8E3gbJ4UWtqzctMYJ0jfgE7bQfkoN +I/w== MIME-Version: 1.0 X-Received: by 10.50.111.79 with SMTP id ig15mr638878igb.14.1392806063212; Wed, 19 Feb 2014 02:34:23 -0800 (PST) Received: by 10.50.34.131 with HTTP; Wed, 19 Feb 2014 02:34:23 -0800 (PST) In-Reply-To: References: Date: Wed, 19 Feb 2014 05:34:23 -0500 Message-ID: To: Ferenc Kovacs Cc: "internals@lists.php.net" Content-Type: multipart/alternative; boundary=089e01294c8ca38fd704f2bfee72 Subject: Re: [PHP-DEV] Please fix my git screw up From: rdlowrey@gmail.com (Daniel Lowrey) --089e01294c8ca38fd704f2bfee72 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Wed, Feb 19, 2014 at 2:53 AM, Ferenc Kovacs wrote: > > > > On Wed, Feb 19, 2014 at 3:58 AM, Daniel Lowrey wrote= : > >> This is embarrassing ... >> >> So I made the mistake of git pull on each branch (5.4/5/6/master) (witho= ut >> --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 gi= t >> 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 int= o >> 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 screwup= s > 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=E1cs > @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. --089e01294c8ca38fd704f2bfee72--