How do I resolve conflict states using Sourcetree

Provide an integrated editor where the user can open their code and resolve conflicts.

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