stanio opened a new pull request, #14: URL: https://github.com/apache/xalan-java/pull/14
The important thing is to have `xalan-j_2_7_1_maint` as the 1st parent of the merge. The `master` branch should be then fast-forwarded to this merge. Unless someone pushes more stuff onto `master` beforehand – the operation should be redone then: ``` git checkout -b xalanj-2671-restore-history origin/xalan-j_2_7_1_maint git merge -X theirs origin/master ``` All changes from `master` are preserved/accepted _as is_ – there should be no content differences with `master`: [`master..xalanj-2671-restore-history`](https://github.com/apache/xalan-java/compare/master..stanio:xalan-java:xalanj-2671-restore-history) _Note,_ this PR should not be merged from Github's web UI. Fetch `xalanj-2671-restore-history` from my fork, then: ``` git remote add stanio https://github.com/stanio/xalan-java.git git fetch --all git checkout master git pull git merge --ff-only stanio/xalanj-2671-restore-history git push ``` Assuming the default remote is the original `xalan-java` repo. This pull request should get automatically marked as merged, then. Ref: [XALANJ-2671] [XALANJ-2671]: https://issues.apache.org/jira/browse/XALANJ-2671 'Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits' -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org For additional commands, e-mail: dev-h...@xalan.apache.org
