Merge the same commit in SourceTree after merging in BitBucket

SC05

I am setting up branch permissions on my bitbucket repository. I set the permissions so that only after a pull request a merge can happen.

So i merged a test-branch with my Develop and when I tried to push the local Develop to origin it gave me an error as expected: ´permission denied to update branch´.

After I merged the branches on bitbucket (through the pull request), my SourceTree now says that I need to push my commit (because the original push from local to origin got denied). How can i fix this so that my SourceTree doesnt say i still need to push to origin because I already merged the branches on BitBucket.

minnsey

Hi

I'd open the Git Terminal and use the following to reset your local branch to match the remote

git fetch origin
git reset --hard origin/{branchname}