stanio commented on PR #14: URL: https://github.com/apache/xalan-java/pull/14#issuecomment-1764784206
> When I try to perform the above operations (including the first box), the git merge tells me... The first box shows how this PR has been prepared. The second box shows how it should be executed using my fork/branch being the source of this PR. Thus you don't need the first box if you're going to use my branch, but then (_on Jul 1_): > Unless someone pushes more stuff onto `master` beforehand – the operation should be redone then: > ... > > 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) If you follow the link you may see changes in `master` already. Here are the added commits (changes shown in reverse): - [`xalanj-2671-restore-history...master`](https://github.com/stanio/xalan-java/compare/xalanj-2671-restore-history...apache:xalan-java:master) I'll update this PR with a redone merge one more time. -- 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
