> Hi Wouter, > > Tuesday, May 10, 2005, 11:12:56 AM, you wrote: > > WZ> the only problem with that is that we're committing bugfixes to > WZ> the 3.0.x branch and merge them to HEAD (3.1) once we actually > WZ> release 3.0.1 > > bug fixes should be committed to the 3.0.x branch and once they run > successfully, they should be merged to the HEAD branch, too. Merging > should not be delayed until 3.0.1 is released - merging of so many > commits will become a nightmare! > > That way, bleeding edge people will also profit from each fix. >
no problem, but shouldn't we make sure the bugfix works before we *commit*..? I don't get the part where you say we have to wait for them to 'run succesfully' after they have been committed, how do we decide it's time to merge ? actually, I still think it's easier to commit bugfixes on both branches (little chance on merge conflicts later on) I need to know because I already have some bugfixes related to CRUD that I would like to commit -- Wouter ------------------------------------------------------- This SF.Net email is sponsored by Oracle Space Sweepstakes Want to be the first software developer in space? Enter now for the Oracle Space Sweepstakes! http://ads.osdn.com/?ad_ids93&alloc_id281&op=click _______________________________________________ Andromda-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/andromda-devel
