<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 >

Daniel Markstedt wrote:

>>> I'd be happy to stop posting any patches at all to trunk, and use 2.2
>>> as the development branch....  It really is a waste of time doing
>>> everything twice or three times.
>> That was, in fact, entirely my point.  Which is why I wonder why we have
>> 2.2 yet.

> PR#39690
> PR#7294


Just at a glance, then, my judgement would be that branching 2.2 at that 
time was a mistake.  If indeed the difference is as small as it seems 
(taking a look at that now) then I'd suggest merging 2.2 back into trunk 
(and reverting the embassy removal, saving that and other major rules 
changes for after 2.2).


Freeciv-dev mailing list

Reply via email to