Gitup: merge tool doesn't work

Created on 20 Sep 2016  Â·  6Comments  Â·  Source: git-up/GitUp

image

code merge conflicts, but when I click the ‘Resolve in Merge Tool’ button, noting happened!

I do want this function, help please.

question

All 6 comments

screen shot 2016-09-20 at 12 31 29 pm

Do you have a tool selected in Preferences?

image

what my GitUp chosen is 'FileMerge' ,the default choice.
In fact, I tried all of these choices, with others, when I click 'Resolve in Merge Tool’, error reported( like 'uninstall' ).

Dose any other tool need?

I think that FileMerge is part of the Xcode tools? (Wikipedia says so, at least).

Do you have Xcode installed?

@hawkrives oh, I think what u say is the point. I didn't install Xcode. Do it now. Feedback soon. thx :-)

@hawkrives u r right. FileMerge belongs to Xcode, I installed Xcode minutes ago and then it worked. (tortoise-like-network-speed... lol) thank u so much.

excellent! glad to hear it's working.

Was this page helpful?
0 / 5 - 0 ratings