Hi Andrew, Thu, 29 Mar 2012 17:42:17 +0100 от Andrew Haley <a...@redhat.com>: > On 03/29/2012 04:58 PM, Ivan Maidanski wrote: > > It would be good to deprecate ChangeLog (used as commit log) as well. > > Why? I think this sentence is missing a "because ..." clause.
Sorry for not explaining you how does git merge work. if you don't have a special ChangeLog-aware merge driver installed (like git-merge-changelog) you would almost always get merge conflicts when pulling public modifications into a privately modified ChangeLog file (same for rebasing). Every merge conflict requires manual handling. If it is decided to move to VCS that simplifies parallel development and branch merging, staying with old commit policy (relying on ChangeLog) neutralizes that benefits. PS. I was surprised to hear that free Java developers prefer SVN to Git. How many free Java developers have been contributing to Classpath over the passed 3-4 years? And which of them prefer to stay with CVS and SVN? Regards. > > Andrew.
