-
-
Notifications
You must be signed in to change notification settings - Fork 31.6k
Question about backporting #13833
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Comments
Did you try to |
@mscdex No. Should I? The guide says nothing about |
I've open a PR to update the guide (after similar experience) #13749 |
@refack So, assuming I have no local staging branch, how should I proceed to create a new updated one from |
Yes Then you |
What @refack says is true, but the more common workflow when you're doing anything with git is: git fetch --all # Update all your remote branches
git checkout v6.x-staging
git status # If "up to date" then you're done
git merge --ff-only # If you're "x commits behind"
git reset --hard up/v6.x-staging # If "your branch has diverged from the upstream" Git aliases are quite helpful for this, I do: g fa
g co v6.x-staging
g s
g mf
g rhh I recommend avoiding |
I'm special kind of tweaker, so |
I thought that was just because |
According to the guide, I launch:
and get this:
HEAD is now at b483675300 test,doc: document `crashOnUnhandledRejection()`
while the last commit here is
test: dynamic port in cluster disconnect
. Also, my local file tree is older than one I see here.What do I miss?
The text was updated successfully, but these errors were encountered: