Page History

...

git push -u origin tomcat70

git push --tags

Issues

Merge forward or cherry-pick?

The model we have been using in svn is, effectively, to apply the fix to the latest version and then cherry-pick fixes to older releases. The natural git model is to apply the fix to the oldest version with the problem and then merge forward.

Solution 1: Cherry-pick

Solution 2: Switch to merge forward

Solution 3: ???

svn:external for native

Solution 1: Move native to git and use a sub-module

Solution 2: ???

CI systems

Solution 1: Switch them to pulling soutrce from git (Gump and buildbot support this)

Solution 2: ???

Configuration file diffs at tomcat.a.o

Solution 1: ???

trunk or master

Solution 1: Rename trunk to master

Solution 2: Keep trunk

Solution 3: ???

Format of commit messages

Need to confirm what this is with infra