I rebased onto main Thursday afternoon and now pull wants me to merge a pile of duplicate commits. I have not pushed the rebase.
Please wait
Opening question…
Fetching the latest questions and answers.
Fetching the latest questions and answers.
I rebased onto main Thursday afternoon and now pull wants me to merge a pile of duplicate commits. I have not pushed the rebase.
I rebased onto main Thursday afternoon and now pull wants me to merge a pile of duplicate commits. I have not pushed the rebase.
If the rebase never left your machine, reset to the remote branch and rebase again, or continue only if you still want those local commits. Do not force-push a shared branch. Check git status and the remote tracking name before you run anything destructive.
Conversation
DiscussionClarify, tip, or follow up with careNo comments yet — start a thoughtful conversation.