I have followed the instructions in https://help.github.com/articles/syncing-a-fork/ however my repository ends up being one commit ahead of the upstream/master each time I do it. If I resync with a quickly changing master I get a bunch of commits that only pertain to the resyncs. Then when I do want to create a pull request I get all of those commits in the pull. For an example, check out https://github.com/plestedr/Ada_Drivers_Library currently identical to the master but still 8 commits ahead.
The only way I’ve found to work around this is to delete my repository and fork it again off of the upstream/master. That works but it seems like overkill. I tried rebasing on upstream/master, but that’s not working either.
What am I missing? The online docs don’t address this topic so I think its something on my end. I get the same results every time.
Hope y’all can point me to somewhere in the docs that can help.