# How you resolve conflicts of file.



##### Post Metadata
- Posted at: over 4 years ago
- Author title: Staff Software Engineer at ServiceMax
- Net upvotes: 1


## Comments
### Comment 1

When you get a merge conflict, there is a context menu in your File Status area. You can click on each conflict file and choose to "Resolve Conflicts" using "Theirs" or "Mine". Alternatively, if you want more oversight on the process, you can open the file and compare the HEAD version to the branch version and selectively choose which lines you want to keep.

##### Comment Metadata
- Posted at: over 4 years ago
- Author title: IT Programmer & Report Specialist



### Comment 2



From SourceTree, click on Tools->Options. Then on the "General" tab, make sure to check the box to allow SourceTree to modify your Git config files.

Then switch to the "Diff" tab. On the lower half, use the drop down to select the external program you want to use to do the diffs and merging. I've installed KDiff3 and like it well enough. When you're done, click OK.

Now when there is a merge, you can go under Actions->Resolve Conflicts->Launch External Merge Tool.


##### Comment Metadata
- Posted at: over 4 years ago
- Author title: Backend developer



### Comment 3

Only  one  user is allowed to run the resolver at any given time.  If a second user attempts to run bk resolve, they will get an error  message
indicating that another user is already running the resolver.

It  is also possible to have multiple users resolve a set of conflicts.
A typical way to do this is to use the bk conflicts command  to  get  a
list  of  files  that  need manual resolving along with a list of users responsible for the conflicting changes.  Then each  user  takes  turns
invoking the resolver on the list of files for which they are responsible, checking in the changes as they go.  After the  conflicts  in  the
individual files have been resolved and checked in, the bk resolve command is run with no arguments in order to finish the process and commit

##### Comment Metadata
- Posted at: over 4 years ago
- Author title: Developer at SI-IC




## Related Product
[SourceTree](https://www.g2.com/products/sourcetree/reviews)

## Related Category
[Version Control Clients](https://www.g2.com/categories/version-control-clients)

## Related discussions
- [How well does Trello scale into a larger team?](https://www.g2.com/discussions/1-how-well-does-trello-scale-into-a-larger-team)
  - Posted at: about 13 years ago
  - Comments: 6
- [Can we please add a new section](https://www.g2.com/discussions/2-can-we-please-add-a-new-section)
  - Posted at: about 13 years ago
  - Comments: 0
- [Quantifiable benefits from implementing your CRM](https://www.g2.com/discussions/quantifiable-benefits-from-implementing-your-crm)
  - Posted at: about 13 years ago
  - Comments: 4