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.

Sign up for GitHub

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

Jump to bottom

Fix docs branch #2042

Closed

2 tasks done

cspotcode opened this issue Jul 25, 2023 · 1 comment

Collaborator

cspotcode commented Jul 25, 2023 •

edited

Loading

#1823 docs->main merge for v10.8.2
#1837 docs->main merge for v10.9.0

Docs branch at time of writing.
https://github.com/TypeStrong/ts-node/commits/77b996b83fe6460a0d03fbf97ab0b99ee6c8e957

Branches off of v10.8.2, has 3 commits on top of it.

Check that any commits on the docs branch from the 10.9.0 merge were not lost.
Rebase current docs branch onto v10.9.1 tag

Collaborator Author

cspotcode commented Jul 25, 2023

Only one commit from the 10.9.0 merge: 45a3c75
But it's already recognized by rebase: v10.9.1...docs
Seems like:

10.9.0 squash-merge from docs->main happened, good
force-push main->docs did not happen

Remaining risk: PRs merged into docs were lost? No, b/c would only occur if erroneous force-push, yet in this case force-push was skipped

docs has been rebased onto v10.9.1

cspotcode closed this as completed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment