-SVN Merge Reminder
Christopher 2013-02-26, 19:26
Just a reminder:
If you fix bugs for 1.5, please do the bugfix in 1.5 branch, then
merge *forward* to trunk (1.6 branch). It keeps things linear that
way, and merges go more smoothly.
At the very least, if you are going to do a bugfix that will be fixed
in 1.5, please don't forget to actually do the merge. I will
occasionally check that all bugfixes in 1.5 branch have merged to
trunk also (to avoid regression bugs), but this will result in
conflicts if you have fixed a bug in trunk instead of the branch...
and I will get annoyed with you :)
Christopher L Tubbs II