From: Stefan K. <ste...@eb...> - 2009-01-14 10:01:11
|
On Wednesday 14 January 2009 09:18:41 Egon Willighagen wrote: > On 1/13/09, Stefan Kuhn <ste...@eb...> wrote: > > Therefore I suggest > > the following: After a merge some nominal change is done and a commit > > message including [MERGED] is committed. If the branch, for some reason, > > sees further development, this will disappear. What do you think? > > I'd rather see that last commit use to delete the branch from the > repository. That would be an option too, but we would loose history then. > > I do not think making functional changes *after* is helping the > merging, and would discourage that; instead, I'd prefer people make a > new branch, fresh from trunk or cdk-1.2.x/.... > > Egon -- Stefan Kuhn B. Sc. M. A. Software Engineer in the Chemoinformatics and Metabolism Team European Bioinformatics Institute (EBI) Wellcome Trust Genome Campus Hinxton, Cambridge CB10 1SD UK Phone +44 1223 49 2657 Fax +44 (0)1223 494 468 |