cfpenton

ref stackoverflow:
https://stackoverflow.com/questions/41283955/github-keeps-saying-this-branch-is-x-commits-ahead-y-commits-behind

works by
1. git remote add upstream https://github/upstream/repo.git
2. git pull --rebase upstream master
2.1 git rebase --skip  (if the conflicts are not true, skip the patches)
3. git push --force-with-lease origin master

If there are branches to fix