The plan when we migrate to git is to migrate to single git repo with the following branches:
master - 9.0.x development tc8.5 - 8.5.x development tc8.0 - 8.0.x development tc7.0 - 7.0.x development We need to decide how we are going to handle a fix that applies to multiple versions. I can see two options: 1. Make the change in master and cherry-pick as required to earlier versions. This is, essentially, what we do now in svn. 2. Make the change in the earliest applicable version and them merge forward. This appears to be the more natural git way of doing things. These options are based on my fairly limited understanding of git. Suggestions for other approaches welcome. Thoughts? Comments? Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
