On Fri, Jan 13, 2012 at 4:05 PM, Alvaro Herrera
<alvherre@commandprompt.com> wrote:
>> 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.
Gets better and better - very positive. OK, will give it a try. Thanks guys.
--
Simon Riggs http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Training & Services