Re: Merging release branch

[Lars Ingebrigtsen]

Glenn Morris <rgm@gnu.org> writes:

> The final straw was a triple failure in the automatic merge today due to:
> an easily avoidable build breakage in the release branch

Sorry about that -- I should have noticed that earlier...

> 3 separate merge conflicts due to the same code being modified on both 
> branches

... and one of those were due to me trying to fix up that breakage in a
hurry and doing it on the wrong branch.  Sorry again.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no