HELP !! Caught in an "endless loop" of 1 commits behind and ahead of master

[capricorn8]

Select Topic Area

Question

Body

First of all: I'm not very experienced in using Github, but I learned to manage the typical use cases needed when contributing to a simple project (https://github.com/musselwhizzle/Focus-Points)

Recently, I'm caught in a ping-pong scenario pushing changes from my fork to the master branch:

• I have changes on my fork (capricorn8/Focus-Points) -> Github tells me I'm x commits ahead of master (musselwhizzle/Focus-Points:master.)
• I push the commits and merge them to master (I have the rights to do so)
• as soon as this has happened, Github tells me my fork is 1 commit behind of master (part of this commit being the preceding pull request) !?
• If I'm trying to resolve this by merging it back on my branch then again, I'm 1 commit ahead of master again.

I have been looking for a kind of re-base command to bring my fork back to the same exact level as upstream/master. But I have not been able to locate this ability, neither on the web interface, nor in Github Desktop.

The actual "master" of this project is not available anymore to help, so I'm posting my question here.

Can anyone advise what I might have done wrong and what I need to do to escape from this ping-pong?

Many thanks!

[stevesinchak]

Something is out of sync with the fork. If the master has all your important changes merged, an easy fix is to simply delete your fork and then create a new one. Or to be extra safe, just create a new form and abandon the old (incase there are some important changes you don't realize right now in it)

[capricorn8]

Many thanks! I have thought about this but was not sure how this would impact the commit history on master.

For the time being, I was able to stop the ping-pong. Thanks to ChatGPT's coaching I was able to rebase my branch to master (hard reset + force push) and thus remove the commits ahead that actually have no content at all but seemed to have caused the issue. If the problem will come back, then I'll follow your advice!