i've got situation:
- i preparing fix issue.
- i did pull request upstream remote.
- another person preparing fix issue.
- another person doing better fix; pull request has been accepted.
- my pull request rejected.
what best thing can origin remote head?
you need fetch origin, , rebase current branch on top of it.
enough.
git pull --rebase upstream
you might want checkout branch 1 using fix, though, since doesn't make sense reapply commits fix has been accepted (with different commits different pull request).
this assumes have remote repo address declared in local repo named 'upstream', refering original repo have forked.
once have rebased work in progress on top of updated upstream, can push origin (your fork).
Comments
Post a Comment