To resolve merge conflicts in Sourcetree, follow these steps:
- In the top toolbar, click the 'Stash' icon.
- Enter a stash message.
- Choose whether to include untracked files and check the boxes if needed.
- Click 'OK' and Sourcetree saves your changes and clears your working directory.
