Skip to content

Backport changes to reference docs from 3.2.0 #16202

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

Merged

Conversation

bishabosha
Copy link
Member

@bishabosha bishabosha commented Oct 18, 2022

did a rebase of release-3.2.0 onto language-reference-stable and fixed conflicts

fixes #16201

@bishabosha
Copy link
Member Author

I think I need to change nightlyOf to movedTo in the front matter

@bishabosha bishabosha force-pushed the lang-ref-stable-3.2.0 branch 2 times, most recently from 19f3c63 to 7d1f440 Compare October 18, 2022 08:35
@bishabosha
Copy link
Member Author

now I added only changes to the reference docs, the sidebar and the layout

@bishabosha
Copy link
Member Author

bishabosha commented Oct 18, 2022

How I fixed it: Take the latest language-reference-stable branch, e.g. commit 5b81f19. Rebase release-3.2.0 onto it, fixing any conflicts. Then adjust all nightlyOf occurrences in the markdown front matter to movedTo. Then unstage all commits by resetting to the reference stable head with git reset 5b81f19, then add only the reference docs changes with git add docs/_docs/reference and git add project/resources/referenceReplacements

@bishabosha bishabosha force-pushed the lang-ref-stable-3.2.0 branch from 7d1f440 to 8372014 Compare October 18, 2022 08:51
@bishabosha bishabosha changed the title Lang ref stable 3.2.0 Backport changes to reference docs from 3.2.0 Oct 18, 2022
@bishabosha
Copy link
Member Author

I suggest this also to be added as a step in the release procedure

@julienrf
Copy link
Contributor

I wonder if a merge would work better than a rebase?

@bishabosha
Copy link
Member Author

I wonder if a merge would work better than a rebase?

I guess in case changes occur independently? in this case it seems the changes don't overwrite anything

@bishabosha bishabosha added area:documentation fasttrack Simple fix. Reviewer should merge or apply additional changes directly. and removed fasttrack Simple fix. Reviewer should merge or apply additional changes directly. labels Oct 18, 2022
@Kordyjan Kordyjan merged commit 8ced261 into scala:language-reference-stable Oct 18, 2022
@Kordyjan Kordyjan deleted the lang-ref-stable-3.2.0 branch October 18, 2022 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants