You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
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?
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