Re-target two commits from 3.0.1.md to 3.0.2.md - #1691
Merged
webron merged 4 commits intoOct 3, 2018
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
@webron with this PR in place v3.0.2-dev will merge into master ok (but with a conflict in README.md which needs resolving anyway). I tried cherry-picking 6943cc1 into v3.0.2-dev but it didn't actually improve the situation with regard to README.md needing manual resolution, so I haven't pushed that as a PR. .travis.yml shows up as a modified file, but the relevant changes are already in master, so that becomes a nop and therefore does not need to hold up cutting the v3.0.2 release. |
Sorry, something went wrong.
webron
approved these changes
Oct 3, 2018
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
Reviewers
3 participants
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.
Two commits (3e7d0a8 and 4c79d31) were correctly made on the v3.0.2-dev branch, but inadvertently against the wrong file (versions/3.0.1.md instead of versions/3.0.2.md).
This series of commits reverts the two original commits in reverse order, then applies the same diffs to the correct target file.
All metadata from the original commits has been preserved.