On 01/31/2011 11:46 PM, RJ Ryan wrote: > The main reason against refactoring too much is that you may cause > merge-hell for the 20 or so outstanding branches > <http://code.launchpad.net/mixxx> that will be looking to merge to trunk > in the near future.
With that said, you could continue to work in your branch, but wait on a merge proposal until the other outstanding branches that change the code you're working on are merged. When they are, merge trunk into your branch, fix any conflicts, then propose it for merge to trunk. Otherwise, just wait until the outstanding branches are merged before you do much work. :) Sincerely, Sean M. Pappalardo "D.J. Pegasus" Mixxx Developer - Controller Specialist ------------------------------------------------------------------------------ Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d _______________________________________________ Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
