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 15:46:10 -0300
Message-ID: <1326480117-sup-6114@alvh.no-ip.org> (raw)
In-Reply-To: <4F106A08.9010704@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>
<1326470664-sup-9639@alvh.no-ip.org>
<4F106A08.9010704@dunslane.net>
Excerpts from Andrew Dunstan's message of vie ene 13 14:29:44 -0300 2012:
> Yeah. Just note this from the docs:
>
> The third syntax ("git merge --abort") can only be run after the
> merge has resulted in conflicts. git merge --abort will abort the
> merge process and try to reconstruct the
> pre-merge state. However, if there were uncommitted changes when the
> merge started (and especially if those changes were further modified
> after the merge was started), git merge
> --abort will in some cases be unable to reconstruct the original
> (pre-merge) changes.
Hm. Whenever I find myself trying to merge something in a tree that
also has uncommitted changes (which is not very often), what I do is
"git stash" to save my work elsewhere and then run the git merge. That
way, if things go wrong (which is also not very often), I can just abort
the merge and pop the patch from the stash, and I'm right back where I
started. Otherwise, I pop my patch from the stash anyway and any merges
are handled by the same merge mechanism, so I can also roll that back if
things don't turn the way I initially wanted.
So while you can certainly screw up and lose work, it's also true that
you have all the tools not to.
--
Á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: <1326480117-sup-6114@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