I have a repository in Git. I made a branch, then did some changes both to the master and to the branch.
Then, tens of commits later, I realized the branch is in muc
For me, i wanted my devl to be back to the master after it was ahead.
While on develop:
git checkout master git pull git checkout develop git pull git reset --hard origin/master git push -f