Updating a local fork without clicking on a commit?

Question

I seem to be having some merge issues that overwhelm my craving requests that I don't want to click on. I currently have a local fork with upstream installed in the base repository, and I am updating my repository as follows:

git fetch upstream
git merge upstream/n3960  

where n3960is my branch I'm working on, the problem is that I click on my fork, I get all these Merge remote-tracking branch 'upstream/master' into n3960when I update my branch, when another member clicks on the base repo, how can I avoid all of these mergers occurred in my craving requests?

Example: my recent transfer request is filled with these Merge remote-tracking branch 'upstream/master' into n3960commits, I want to try to avoid this overflow > the actual commits!

Answer 1

You do not need to merge.

You can:

# rebase n3690 on top of upstream/master
git checkout n3690
git rebase upstream/master

# then
git push -f 

By using push, it will automatically update your current Pull request.

And rebase avoids all of these commits.