ci: move code to avoid conflict in schxslt rebase #1853
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The schxslt automatic rebase wants to delete a test case that is at the end of the file. Keep that code at the end to try to avoid recurring merge conflicts during the rebase operation.
galtm
force-pushed
the
move-bats-cases
branch
from
b704e84
to
110d889
Compare
|
The rebase went smoothly. :) Also, the content of |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR toward the master branch just moves the code added in #1780 to a different spot in the file relative to the
Bad Schematron @locationsection.The schxslt automatic rebase wants to delete the
SVRL @location fails to select text node #396test case within theBad Schematron @locationsection. Keeping it at the same location of the file where it had been (before #1780) might avoid recurring merge conflicts during the rebase operation.