Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

change several files to state of remote

I tried to pull from a remote server and merge conflicts on two files which I'll call A and B. Except I realized afterward that all I really wanted to do is choose the remote version of A and B and discard my local version.

I think I messed up the merge and I just want to discard what I have now and change to the current state of the remote versions.

Apparently I'm 4 commits ahead of the remote, but I don't want to push yet until I've resolved this.

Here is a screenshot of SourceTree. What can I do to resolve this; i.e. change my two files to the remote versions before I commit and push?



1 answer

0 votes
minnsey Atlassian Team Oct 22, 2018


I would reset my local repo to match the remote, effectively deleting the failed merge.

From the command line, something like this

git fetch origin
git reset --hard origin/master

, In Sourcetree for Windows, select the correct commit from the remote in the Log View, Right click and then select Reset to this commit and then choose the Hard option

Suggest an answer

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

7,263 views 5 14
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you