Need help: main and branch repositories have entirely different commit histories #121983
Replies: 1 comment
-
🕒 Discussion Activity Reminder 🕒 This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions: 1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as 2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own. 3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution. Note: This dormant notification will only apply to Discussions with the Thank you for helping bring this Discussion to a resolution! 💬 |
Beta Was this translation helpful? Give feedback.
-
Select Topic Area
Question
Body
Hello
I recently ran
git filter-repo
as there was an exposed secret in a history of commits in my branch repository. After successfully pushing the changes locally (which was a bit of struggle) to my branch, I no longer can merge or make pull requests in either main or branch. I always get stuck when github tells me: "There isn’t anything to compare. Main and branch are entirely different commit histories. "I've tried the following solutions with the same end result:
git --rebase origin main
as described here: https://stackoverflow.com/questions/71768999/how-to-merge-when-you-get-error-hint-you-have-divergent-branches-and-need-to-sEverytime I make an attempt to push after making changes, I always need to re-establish a remote repo even after cloning from the repo. I'm not sure why this is.
Here's my repo: https://github.com/spookyWalrus/ramenReport
Any help regarding this is appreciated
Thanks in advance
Beta Was this translation helpful? Give feedback.
All reactions