I am using GitHub client on MAC OS X 10.10. (Please note that I am not using GitHub for Enterprise.)
I noticed that when there is a merge conflict, GitHub Client is prompting me to either resolve the conflict using Finder or External Editor. I do not see the file in merge conflict within GitHub client itself. So I want to setup one of the editor ( I am using Brackets) as a external editor.
In current scenario, when I click on External Editor button in GitHub (which is shown when merge conflict happens), I see the file in merge conflict in Safari browser.
I also looked at git command prompt options to see if there is a way change the setting for GitHub client using terminal window.
So far I found out that I can setup core.editor global config for git terminal/command line tool only, but not able to set the external editor of my choice for GitHub client.
Any suggestion will be appreciated.
In the menu bar, use the GitHub Desktop drop-down menu, then click Preferences. In the Preferences window, select Integrations. Use the "External Editor" drop-down menu, and choose the editor you want to set as your default. Click Save.
The command to do this is git config --global core. editor "nano" . You can change the highlighted section with your editor of choice!
Changing the Git editor to Notepad++ Obviously, on an x64 machine, Notepad++ would be found under the Program Files (x86) directory. The bottom line is that when you run this command, make sure you provide the correct location of your text editor of choice.
I just tested on Mac, and as @Nick Volynkin suggested, you need to change the system default for that extention.
On mac in the finder, right click a file with the appropriate extension, click "info" and change "open with" default. http://www.mactip.net/change-default-application-file-extensions/
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With