On Tuesday 04 July 2006 14:02, Isaac Clerencia wrote: > Hi, folks. > > I've just created a branch to use to continue 1.2 development, enabling > developers to start committing new shiny stuff to trunk. > > -- > > Every change that only affects 1.2 should go to the 1.2 branch. > > Every change that breaks the feature/code/string freeze should go to trunk. > > Every change that is intended to both should be, either commited to both or > committed to the 1.2 branch and clearly be marked in the commit log as > "also for trunk", I'll take care of merging this changes once a day.
Remember than commiting the changelog updates in a separate commit really helps merging the patches. In the trunk changelog only changes intended exclusively for trunk should be added, once 1.2 is out I'll add all the stuff in 1.2's changelog to trunk's changelog. Best regards _______________________________________________ Wesnoth-dev mailing list [email protected] https://mail.gna.org/listinfo/wesnoth-dev
