best git GUI for OSX for resolving conflicts?

[purbeast0]

while i can get by with the command tool no problem for basic things, when i need to resolve conflicts with a rebase, i simply need a GUI for that. doing that with the command line isn't going to happen for me.

the storyboard files and project files are a huge pain in the ass and have conflicts at basically every damn commit because i believe it just changes an identifier, which doesn't even matter. but because of that, it conflicts.

does anyone know of a good tool that is good for resolving conflicts? on windows I use either tortoiseGIT for this or the built in tools with intelliJ.

i've tried GitX and SourceCode for OSX and neither of those are helpful with this so far.

anyone have a recommendation?

 

[mosco]

I use source tree, but good luck working with storyboards in source control

My colleague uses git tower. In any case, we don't use storyboards, so no experience there.

 

[gdansk]

Atlassian's SourceTree is my preferred program when I become confused.

 

[purbeast0]

yeah i ended up actually using source tree with diffmerge for the conflicts. i meant "source tree" in my OP not "source code"

man oh man, xcode project files in version control are not fun. however, it was actually very easy to resolve all of the conflicts. the conflicts were all pretty much adding new files/directories to the project, and the way it stores the information it thinks you are replacing stuff instead of adding it, so that is annoying. but all the conflicts i just kept both and it worked fine.

then i added a new pod (as did someone in master) and that was a conflict, which i manually just had to add them to the podfile. but the pods project file was completely botched too, but afterwards i just ran the pod install command and that resolved everything.

now that i know how to do it, it definitely won't be as rough in the future.

 

[Leros]

The best three way merge tool I've found so far is actually the Git merge resolution built into IntelliJ.

 

[purbeast0]

The best three way merge tool I've found so far is actually the Git merge resolution built into IntelliJ.

i agree with you, and you know, this made me search on google to see if you can load xcode projects into intellij, and i came across their software AppCode which apparently is for ios/osx development.

it basically looks like intellij for ios development. i'm going to try this out tonight when i get home, and holy crap, if i can use "intellij" over xcode, i'm going to get A LOT more work done! thanks for the pointer.

 

[Leros]

i agree with you, and you know, this made me search on google to see if you can load xcode projects into intellij, and i came across their software AppCode which apparently is for ios/osx development.

it basically looks like intellij for ios development. i'm going to try this out tonight when i get home, and holy crap, if i can use "intellij" over xcode, i'm going to get A LOT more work done! thanks for the pointer.

I love JetBrains products. It's the only software I pay for. I use open source programs for everything, but I don't mind paying $100/year for their IDEs.

 

[purbeast0]

yeah i tried using AppCode the past few days and it just doesn't work well for iOS development. there are some basic things that are missing that just make it not really usable for me.

like for instance when you are overriding functions, it won't populate the default params like xcode does. and when you have errors it doesn't have the autocorrect stuff like xcode does, which i need a lot for the ! and ? stuff because this is my first time using swift and i'm learning that stuff. then there is other odd code completion stuff.

sucks too because it's SSSSOOOO close to being perfect. i've been using xcode this weekend though and i'm starting to get more used to it with the macbook touchpad because now i have all these shortcuts and stuf. xcode is still quirky as hell though.