Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
JIRA Ticket: https://ulstracker.atlassian.net/browse/ISLANDORA-273; https://ulstracker.atlassian.net/browse/ISLANDORA-274
What does this Pull Request do?
Removes two previous commits as a branch for the 7.x fork. FOR REVIEW ONLY. DO NOT COMMIT.
What's new?
Allows for a git revert of 7.x, allowing upstream commits to be brought to current for 7.x.
How should this be tested?
Check out 7.x and tokens_for_filenames_feature branches. Run
git diff 7x..tokens_for_filenames_feature. The diff should replay both 67f2e99, 5ce236f changes.Additional Notes:
This change frees up the 7.x, and includes changes for the module as a separate branch to be included for other non-main branches.