You are viewing an old version of this page. View the current version.

Compare with Current View Page History

Version 1 Current »

The Java code in Tomcat Native is merged in from https://gitbox.apache.org/repos/asf/tomcat.git master using the following process.


# Start in the root of the Tomcat Native repo
git remote add -f -t master --no-tags 9.0.x https://gitbox.apache.org/repos/asf/tomcat.git
git merge -s ours --no-commit 9.0.x/master
git read-tree --prefix=java/org/apache/tomcat/jni/ -u 9.0.x/master:java/org/apache/tomcat/jni
git commit

The Java code in Tomcat Native is updated using:

# Start in the root of the Tomcat Native repo
git merge -s ours --no-commit 9.0.x/master
git rm -rf java/org/apache/tomcat/jni
git read-tree --prefix=java/org/apache/tomcat/jni/ -u 9.0.x/master:java/org/apache/tomcat/jni
git commit
  • No labels