Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,359,944
Community Members
 
Community Events
168
Community Groups

Merge the same commit in SourceTree after merging in BitBucket

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.

1 answer

0 votes
minnsey Atlassian Team Oct 04, 2018

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}

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

78,687 views 134 29
Read article

Atlassian Community Events