These days I can run everything I need to with the git cli. I use the JetBrains visual merge tool to resolve conflicts, because doing that by hand is so awfully error prone, it very very intuitively maps to a visual process
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments