change several files to state of remote

Michael Mossey October 19, 2018

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?

sourcetree.png

 

1 answer

0 votes
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
October 22, 2018

Hi

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
TAGS
AUG Leaders

Atlassian Community Events