← Back to Upcase

Anyone have experience with Atlassian's SourceTree?

(Jon Seidel) #1

On my current project, we’ve run into many conflicts when merging, sometimes requiring multiple git pull origin master and then conflict resolution. This is a very large project with multiple committers and using submodules for ‘library’ and ‘configuration’ elements.

One of the folks suggested SourceTree as a way to make life a bit easier… has anyone had experience with this or other GUI/high-level git tools along these lines?

(Jeff Thomas) #2

I use the cli for everyday stuff https://github.com/thoughtbot/gitsh, but if I need a graphical overview, I use Tower http://www.git-tower.com/. I’ve briefly tried SourceTree, and it looks similar to Tower, but free.

When faced with a nasty merge conflict I use http://www.kaleidoscopeapp.com/. (Mac Only) Follow this link for a killer setup! http://nathancahill.github.io/kaleidoscope-the-most-powerful-diff-tool-for-mac-os-x/

Hope this helps.

(Jon Seidel) #3

Thanks @coloradobum; Tower looks interesting but this client requires only open-source or authorized apps. I’ll see if they have or can get that. Same for kaleidoscope… looks like a great setup!