tvalentyn edited a comment on pull request #15775:
URL: https://github.com/apache/beam/pull/15775#issuecomment-959849272
git can be tricky to deal with sometimes. But you can usually revert to a
happy state by looking up revisions, and resetting to a known healthy state,
like:
```
git reflog --oneline
git reset --hard HEAD@{7}
```
then, you could rebase changes on top of other branches, via smth like:
```
git pull --rebase=interactive origin master
```
or in your case, origin might have been a master from your fork, so you'd
probably do smth like
```
git pull --rebase=interactive apache master
```
Assuming `apache` is a remote that tracked the main repo. You can also do
pull and rebase in separate commands. But yes, I find the workflow easier if
origin is already tracks the apache repo.
You can also force-push any local branch to the branches you control, so
that you don't have to create separate PRs from another branch (but that works
too of course).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
