git - Pull request on github - showing commits rebased from master -
i'm working team , we're doing feature branches , pull requests.
i created branch, worked on bit while doing little work on master.
then, rebased branch against master. want pull request.
however, in github, pull request shows commits happened between when first made branch , - commits did on feature branch, , commits on master happened in between.
this noisy clutter - doing wrong? i'd pull request show commits i've made, since other commits on both master , on branch, no difference.
the suggestion see making branch based on latest upstream master , cherry picking commits branch onto it.
i used have same problem:
if have foo
branch, branched master
, pushed origin
, , on both branches changes made, after merging/rebasing getting changes master
in pull request's diff.
i solved executing git fetch
first, updating local master
branch, changing local branch foo
, executing commands:
git rebase master
git push -f origin foo:foo
this forcing remote branch , pr's diff contains proper changes, branch created based on recent master
.
Comments
Post a Comment