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

git merge file with conflict

Aaron and Billy are working on the same file (abcd.text) on master. Aaron committed the file first. When Billy do git pull, he has a conflict. How can Billy take in the changes from Aaron and still keep his own changes? What is the best way to achieve this?

1 answer

0 votes
Tyler T Atlassian Team Jun 05, 2020

Hi @shufen_koh , welcome to the Community!

Billy has a few options.

If his changes are not yet in a commit, he could stash his changes, pull down the latest master, then reapply his changes and resolve the conflict. On the command line, that would look something like this:

git add abcd.text
git stash
git pull
git stash pop

# fix conflict
git add abcd.text
git commit -m 'Commit message'
git push origin master

If a commit has already been made, the workflow would be similar.

Does that help? 

If Billy is still having an issue, please paste his error message here. 

Another more destructive option would be to reset his local branch to origin/master, pull down the latest changes, and then reapply his changes to the file.

Suggest an answer

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

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

1,849 views 0 7
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