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

Update docs 090921 #4913

Merged
merged 8 commits into from
Oct 15, 2021
Merged

Conversation

christinerose
Copy link
Contributor

Updated docs on new branch to avoid merge conflicts and work around the signoff error

Signed-off-by: Christine Rose <professor.rose@gmail.com>
Signed-off-by: Christine Rose <professor.rose@gmail.com>
christinerose and others added 6 commits September 13, 2021 11:49
Signed-off-by: Christine Rose <professor.rose@gmail.com>
Signed-off-by: Christine Rose <professor.rose@gmail.com>
Signed-off-by: Christine Rose <professor.rose@gmail.com>
Signed-off-by: Christine Rose <professor.rose@gmail.com>
@christinerose christinerose merged commit 87a2d25 into ocaml:main Oct 15, 2021
@christinerose christinerose deleted the update_docs_090921 branch October 15, 2021 17:26
@ghost
Copy link

ghost commented Nov 22, 2021

@christinerose this PR accidentally scrambled some of the dos we looked at together in #4921. I just noticed this while reviewing #5206. It seems that git did something weird while merging. In the future, it's probably worth glancing at the changes again after a merge. Doing a rebase rather than a merge should generally be safer.

@ghost ghost mentioned this pull request Nov 22, 2021
@ghost
Copy link

ghost commented Nov 22, 2021

FTR, I re-did the changes in main.

@christinerose
Copy link
Contributor Author

Thank you! I’ll do a rebase next time then. 😊

@christinerose
Copy link
Contributor Author

Is it okay to delete this branch now?

@ghost
Copy link

ghost commented Nov 23, 2021

Yes, generally you can delete a branch as soon as it is merged.

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.

2 participants