Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

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,461,959
Community Members
 
Community Events
176
Community Groups

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?

sourcetree.png

 

1 answer

0 votes
minnsey Atlassian Team Oct 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

Atlassian Community Events