Forked repo out of sync

[Paolo Amoroso]

To make changes to the project site I forked the Interlisp.github.io repo on GitHub, edited the relevant files on GitHub, and submitted a few PRs which were merged.

Now my forked repo is a number of commits ahead:

When new commits are available from the remote and I sync the fork, I skip the commits that are ahead as prompted. But the number of commits ahead keeps growing as new remote commits come in.

How do I fix the mess resolve the situation and deal with the commits ahead? Do I have to submit a new PR by clicking the "Create pull request" button?

Paolo

--

Paolo Amoroso | Blog | Mastodon

[Larry Masinter]

I didn't see a response to this. I wasn't sure of the answer myself, so I asked Microsoft Copilot to generate a reply:

The selected text is a discussion about managing a forked GitHub repository. Here’s a summary:

• Forking and Editing: Paolo forked the Interlisp.github.io repository on GitHub, made some changes, and had his Pull Requests (PRs) merged into the main repository.
• Ahead Commits: After the PRs were merged, Paolo noticed that his forked repository is ahead of the original repository in terms of commits.
• Syncing Issue: When new commits are available from the original repository, Paolo tries to sync his fork. However, he skips the commits that are ahead as prompted, leading to an increasing number of ahead commits as new commits come in from the original repository.
• Seeking Solution: Paolo is asking for advice on how to resolve this issue. He wonders if he needs to submit a new PR by clicking the “Create pull request” button to deal with the commits that are ahead.

This situation is common when working with forked repositories on GitHub. It’s important to regularly sync the forked repository with the original repository to keep them in sync and avoid conflicts. If the number of ahead commits keeps growing, it might be necessary to rebase the forked repository or merge the changes from the original repository. This can be a complex process and might require careful handling to avoid losing changes. It’s always a good idea to seek advice or refer to GitHub’s documentation when dealing with such issues.

--
You received this message because you are subscribed to the Google Groups "Medley Interlisp core" group.
To unsubscribe from this group and stop receiving emails from it, send an email to lispcore+u...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/lispcore/CAGi1hzuhAW_ZJy%3DODTwjmz0-Vxg0G1Miq7rOvBSNC8QcthLZoA%40mail.gmail.com.

--

https://LarryMasinter.net  https://interlisp.org

[Paolo Amoroso]

Thanks Larry, I've just checked and the forked repo had 6 commits ahead and 6 behind.

The dialog I got after clicking "Sync fork" advised to discard 6 commits to match the upstream repo:

I did as advised and clicked "Discard 6 commits". Now the fork is apparently back in sync:

WeI'll see how it goes.