i18n(nl) diff feikedonia master to pop-os master

[feikedonia]

feikedonia master is 55 commits ahead of pop-os master;
I want to know why that is;
so I want to diff my repo against pop-os master

[feikedonia]

Can be merged, don't know why my master is still 55 commits ahead of yours, but the code is pretty much the same.

I have made some minor modifications, dough.

[mmstick]

You need to rebase your branch with the latest commit on master.

[feikedonia]

It says the following:

[mmstick]

You are using merges to your local branch, instead of squashing and rebasing, and therefore your branch has a different history than the upstream master branch. You need to squash your commits, and do a hard reset on your local branch to get it in sync.

Assuming your local branch is still called master, the remote for pop-os is origin, and your personal fork is local:

git checkout -b rebase
git fetch origin
git reset --hard origin/master
git merge --squash master
git branch -D master
git checkout -b master
git push local master --force

You may be interested in https://medium.com/singlestone/a-git-workflow-using-rebase-1b1210de83e5