Re: git merge mess to sort out

[Carl Sorensen]

On 5/27/11 7:53 PM, "Carl Sorensen" <address@hidden> wrote:
> On 5/27/11 6:16 AM, "Graham Percival" <address@hidden> wrote:
>> Unfortunately, at the moment this produces a bunch of merge conflicts.
>>  Probably nothing serious, but it's an annoyance.  Since it's been so
>> long since the last release, I just went ahead and re-created the news
>> announcements (which of course creates another merge conflict).
> 
> 
> I'll take it on.

Merge is completed.  We have a bunch of duplicate commits, but everything is
merged.

I'll try to avoid that in the future.

Thanks,

Carl