How to Resolve Conflict in Sourcetree

‍

‍

To resolve merge conflicts in Sourcetree, follow these steps:

‍

1. In the top toolbar, click the 'Stash' icon.
2. Enter a stash message.
3. Choose whether to include untracked files and check the boxes if needed.
4. Click 'OK' and Sourcetree saves your changes and clears your working directory.