I'm going to compare some w/ a git plugin in PyCharm.
PyCharm shows actions to continue or abort merge at the top when in the middle of one. Wish Sourcetree had something up front like that.
When conflict are resolved via a FileMerge, the result is not added or something, because Sourcetree seems to be confused and can't continue thinking things are still unresolved. I had to go to commandline and add the files. Tried to a UI equivalent. Can't remember the exact process when it worked -- sometimes it didn't.
