From: Alvaro Herrera <alvherre@commandprompt.com>
To: Andrew Dunstan <andrew@dunslane.net>
Cc: Simon Riggs <simon@2ndquadrant.com>
Cc: Magnus Hagander <magnus@hagander.net>
Cc: Dave Page <dpage@pgadmin.org>
Cc: Robert Haas <rhaas@postgresql.org>
Cc: Pg Committers <pgsql-committers@postgresql.org>
Subject: Re: pgsql: Typo fix.
Date: Fri, 13 Jan 2012 13:05:51 -0300
Message-ID: <1326470664-sup-9639@alvh.no-ip.org> (raw)
In-Reply-To: <4F1052A6.40600@dunslane.net>
References: <E1Rlh5A-0003fw-6f@gemulon.postgresql.org>
<CA+U5nM+TN6cZMkJ_+nTZHM4oXo06fa2NOoM+D2Dr=wy5w26xJQ@mail.gmail.com>
<CA+OCxoxJw4ips6TNatDyasF9FhA4qVX=R7ndmMbVQ-KeZWOQBg@mail.gmail.com>
<CA+U5nMLNLEJY+RHvfiWb3-Zu1reyZ44QEEWi6U3VwVbM7Sc8rQ@mail.gmail.com>
<CABUevEy93JBPVAJ3gGC+4=Nq0471C6NxBT7mtFuZgNtRRBq5Lw@mail.gmail.com>
<CA+U5nM+Es=TC_88Edgpv7Pp4zstz6z-=7uEFU495sVVHnLkX-w@mail.gmail.com>
<4F1052A6.40600@dunslane.net>
Excerpts from Andrew Dunstan's message of vie ene 13 12:49:58 -0300 2012:
>
> On 01/13/2012 10:22 AM, Simon Riggs wrote:
> > On Fri, Jan 13, 2012 at 2:26 PM, Magnus Hagander<magnus@hagander.net> wrote:
> >
> >> Just FWIW, I use a separate development repository as well. But I have
> >> it added as a remote from the "commit repository", and thus just do a
> >> "git merge --squash" instead of manually moving them with "patch".
> >>
> >> But I am very much a fan of keeping the repos separate for just that
> >> reason - don't want to accidentally commit dev code.
> > OK thanks.
> >
> > My patch foo seems occasionally faulty, but git merge --disaster is
> > something I'm happy to avoid. I'll work on my hand grenade juggling
> > skills before I do that.
>
>
> How you work is up to you, but "git merge --squash" is pretty safe,
> since it doesn't actually commit anything.
And if things go wrong you can always do git merge --abort.
I, too, used to be scared of some of the options that git gives us, but
after experimentation I found some of them to be hugely useful and safe
enough that I now very rarely run use patches anymore.
--
Álvaro Herrera <alvherre@commandprompt.com>
The PostgreSQL Company - Command Prompt, Inc.
PostgreSQL Replication, Consulting, Custom Development, 24x7 support
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-committers@postgresql.org
Cc: alvherre@commandprompt.com, andrew@dunslane.net, simon@2ndquadrant.com, magnus@hagander.net, dpage@pgadmin.org, rhaas@postgresql.org
Subject: Re: pgsql: Typo fix.
In-Reply-To: <1326470664-sup-9639@alvh.no-ip.org>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox