Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-target two commits from 3.0.1.md to 3.0.2.md #1691

Merged
merged 4 commits into from
Oct 3, 2018

Conversation

MikeRalphson
Copy link
Member

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.

@MikeRalphson
Copy link
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.

@webron
Copy link
Member

webron commented Oct 3, 2018

@MikeRalphson Life saver.

@webron webron merged commit 43569f6 into OAI:v3.0.2-dev Oct 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants