Skip to content

Conversation

kianmeng
Copy link
Contributor

@kianmeng kianmeng commented Dec 6, 2021

No description provided.

@HansN HansN self-assigned this Dec 7, 2021
@HansN HansN added team:PS Assigned to OTP team PS spelling testing currently being tested, tag is used by OTP internal CI labels Dec 7, 2021
@HansN
Copy link
Contributor

HansN commented Dec 8, 2021

Thanks! Could you please rebase at least the documentation files onto maint?

@HansN HansN removed the testing currently being tested, tag is used by OTP internal CI label Dec 8, 2021
@kianmeng kianmeng force-pushed the fix-typos-in-lib-crypto branch from 7884713 to 9b98414 Compare December 8, 2021 22:43
@kianmeng
Copy link
Contributor Author

kianmeng commented Dec 8, 2021

Thanks! Could you please rebase at least the documentation files onto maint?

@HansN Not sure how to proceed with this?

$ git checkout maint
hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
hint: you can do so by fully qualifying the name with the --track option:
hint: 
hint:     git checkout --track origin/<name>
hint: 
hint: If you'd like to always have checkouts of an ambiguous <name> prefer
hint: one remote, e.g. the 'origin' remote, consider setting
hint: checkout.defaultRemote=origin in your config.
fatal: 'maint' matched multiple (2) remote tracking branches

@HansN
Copy link
Contributor

HansN commented Dec 17, 2021

@kianmeng I'm not quite sure what you need help with, but a good start is

I guess that what you need to do to rebase onto maint is something like:

git fetch upstream maint
git checkout maint
git checkout fix-typos-in-lib-crypto
git rebase --onto maint HEAD^

where upstream is the repository from which you fetched master.
You will probably get merge conflicts. In that case, do git status and edit the files that have conflicts. Follow the instructions printed by git status to proceed.

@kianmeng kianmeng force-pushed the fix-typos-in-lib-crypto branch from 9b98414 to 2fbcc5a Compare December 17, 2021 09:26
@kianmeng kianmeng changed the base branch from master to maint December 17, 2021 09:35
@kianmeng
Copy link
Contributor Author

@HansN Thanks for the instructions. Please check again.

@HansN HansN added testing currently being tested, tag is used by OTP internal CI and removed testing currently being tested, tag is used by OTP internal CI labels Dec 17, 2021
@HansN HansN merged commit 45e5298 into erlang:maint Dec 20, 2021
@HansN
Copy link
Contributor

HansN commented Dec 20, 2021

Thanks for the PR.

@kianmeng
Copy link
Contributor Author

@HansN Welcome. Glad to help.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
spelling team:PS Assigned to OTP team PS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants