search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.45k stars 1.24k forks source link

Merge tool is still not working with the latest update #911

Closed OlgaRudina closed 1 year ago

OlgaRudina commented 1 year ago

Version 1.3.5(1048)

lucasderraugh commented 1 year ago

I need more information to make this an actionable ticket. What are your exact steps, observed behavior, and expected behavior.

OlgaRudina commented 1 year ago

@lucasderraugh open repo -> merge one branch to another (with conflicts) -> click on the conflict file -> click on Resolve with merge tool -> nothing happens. Expected behaviour: Merge tool is opened.

lucasderraugh commented 1 year ago

What happens if you do the steps in #861?

OlgaRudina commented 1 year ago

@lucasderraugh this one helped https://stackoverflow.com/questions/17980759/xcode-select-active-developer-directory-error/17980786#17980786 Thanks!