Re: [FYI] maint merged into yacc-work

[Ralf Wildenhues]

* Stefano Lattarini wrote on Mon, Apr 11, 2011 at 05:33:47PM CEST:
> The yacc-work branch, due to its slow advancing pace, was falling more 
> and more out of sync with maint, and thus with all the improvements
> and bug fixings done there in the meantime.  Since yacc-work is meant
> to be eventually merged into either maint or master (we still have to
> decide which one fits better), there is no point in leaving this
> situation worsen further.  I've thus merged maint into yacc-work,
> fixed the spurious resulting conflicts, and pushed.

Thank you.  If it helps you, feel free to do that more regularly.

FWIW, I usually don't leave the "Conflicts:" comment in the merge commit
log, because when the conflicts have been resolved, there is little
reason to clutter up the log.  You can anyway easily see the actual
places that conflicted later, by looking at 'git show $merge_sha'.

Cheers,
Ralf