The problem is with the updated commits, they are glued into a single commit, which appears as a single commit(combo of 10 or more commits) in fork log
That is expected, since you have pulled (fetch+merge)
I would advise you to locally remove to remove that merge commit, and rebase (ie replay your commits) on top of upstream/master
(with upstream
being the remote name for the original repo)
Plus, I would have isolated those changes in a dedicated branch, but since you have started the PR from master
, let's stay on master
.
Make sure you don't have any local work in progress.
cd /path/to/local/repo
git remote add upstream <Repository URL>
Check the output of git remote -v
: you should see upstream
and origin
, with origin referencing your fork.
git log # make sure master HEAD is at the right commit
git fetch upstream
git rebase upstream/master
# test if everything is still working
git push --force