# How do I resolve conflict states using Sourcetree

In Sourcetree it is difficult to know if you are in a conflict state, first of all how to know that and after knowing how to resolve it.

##### Post Metadata
- Posted at: over 6 years ago
- Author title: Senior Consultant
- Net upvotes: 1


## Comments
### Comment 1

Provide a inbuilt editor where user can open his code and resolve conflict. 

##### Comment Metadata
- Posted at: about 4 years ago
- Author title: iOS App Developer at IThink Solutions



### Comment 2

To know if you're causing a conflict, just commit and push your changes. If there's a conflict, the problematic files will remain unstaged with a warning on them, while to non-conflicting files will remain staged.

To resolve conflicts, right click on an individual unstaged file (with a warning) --> Resolve conflicts. This will give you the option to resolve using your local file or the file from the branch you're trying to merge to. Once the conflict is resolved, the file will be staged.

When you're done resolving conflicts, commit and push again

##### Comment Metadata
- Posted at: over 6 years ago
- Author title: Unity Developer at UNIT9




## 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: almost 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: almost 13 years ago
  - Comments: 0
- [Quantifiable benefits from implementing your CRM](https://www.g2.com/discussions/quantifiable-benefits-from-implementing-your-crm)
  - Posted at: almost 13 years ago
  - Comments: 4