Re: I screw up git release/unstable

[Graham Percival]

On Mon, Jul 5, 2010 at 12:37 PM, David Kastrup <address@hidden> wrote:
> Graham Percival <address@hidden> writes:
>
>> Could somebody make release/unstable be exactly the same as master?  I
>> don't care if you delete it and make a new one, or do some fancy git
>> thing to move the ref around, or what... I just want to get rid of all
>> current differences between master and release/unstable, without doing
>> anything to master.  The only "good" change that we'd lose would be
>> the news item, but that was just an exact copy of the previous 10
>> release announcements, so no worries.


... wow, apparently I even screwed up the subject line!

> There are basically two ways to do that.  One is more or less a relabel
> and would consequentially lose history.

If it loses history from release/unstable, I consider that a desirable
side effect.

>  The other is a trivial merge
> with master with a merge strategy that lets master win always.  The
> latter should make it easier for people to pull, I think.

AFAIK I'm the only one who uses release/unstable, so that's not a huge concern.

Do whichever is easiest/safest for you, please.

Cheers,
- Graham