我不小心从一个分支分支了，现在我想撤消这个

Question

How do I fix a branch so that it is synced with master? It'd almost be easier to delete the branch and then remake it, but I was wondering if there was a way to do this without it coming to that?

When I made the branch, I branched off another branch instead of master.

Answer 1

Rebase your changes onto master:

git rebase --onto master your-previous-source-branch

(when your current branch is active)

This will rewrite your branch like it was just branched off master and have all commits to it done after it.

Note that it will not be the same branch anymore and you'll have to do a forced push to remote, if branch is already there, be sure not to overwrite someone other's commits to it