Skip site navigation (1) Skip section navigation (2)

Re: pgsql: Typo fix.

From: Andrew Dunstan <andrew(at)dunslane(dot)net>
To: Simon Riggs <simon(at)2ndQuadrant(dot)com>
Cc: Magnus Hagander <magnus(at)hagander(dot)net>, Dave Page <dpage(at)pgadmin(dot)org>, Robert Haas <rhaas(at)postgresql(dot)org>, pgsql-committers(at)postgresql(dot)org
Subject: Re: pgsql: Typo fix.
Date: 2012-01-13 15:49:58
Message-ID: 4F1052A6.40600@dunslane.net (view raw or flat)
Thread:
Lists: pgsql-committers

On 01/13/2012 10:22 AM, Simon Riggs wrote:
> On Fri, Jan 13, 2012 at 2:26 PM, Magnus Hagander<magnus(at)hagander(dot)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.

cheers

andrew

In response to

Responses

pgsql-committers by date

Next:From: Alvaro HerreraDate: 2012-01-13 16:05:51
Subject: Re: pgsql: Typo fix.
Previous:From: Simon RiggsDate: 2012-01-13 15:22:41
Subject: Re: pgsql: Typo fix.

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group