But they each have their strengths and weaknesses. I have found SourceTree to be the best git GUI for me, at any price. But occasionally I just want to say 'use my local copy' or 'use the remote version' and in that situation I find it difficult to know which is which. Its merge conflict support is just fine for working through a file line by line: you can use any 3-way merge tool, such as Apple's FileMerge. One weakness is resolving merge conflicts using 'Theirs' or 'Mine'. Last time I tried Tower and Sublime Merge they could not. SourceTree and Fork can both show the annotation for a tag. I find the history layout very efficient: a single window shows commits, uncommitted changes and the diff between any two commits (or your uncommitted changes and any commit). No other git GUI I have tried does this the others only show the diff between the uncommitted state and HEAD, and you have to change views to see it. I own Fork and have tried Tower and Sublime Merge.įor me, the standout feature for SourceTree is that it treats the current uncommitted state as just another node in the history, allowing you to easily compare uncomitted changes to any other commit. If you haven’t setup your filetype associations correctly on your local machine, this should guarantee all file types open using your selected application when you edit/view the file in Filezilla.SourceTree is my favorite git GUI, especially for viewing history and changes (my main use for a GUI I use the command line for most other things).

Browse for your code/text editor on your local machine.

Next, in Filetype associations ( Under File Editing ), uncheck inherit systems filetype associations because this feature does not always work. To change the settings so the files on your server open with a specific program: If you view/edit a file in Filezilla after connecting to your server, it won’t automatically open using your default text/code editor: Rather then open your files using text/edit, notepad or your browser, a better and safer option is to open your files using your code editor. If you don’t configure these settings In Filezilla, your files may open using notepad in Windows or text/edit in Mac which isn’t safe to edit. Windows users might want to set Notepad++ instead. In this case, all files will open using Text Wrangler for Mac users. This post shows you how to change your Filezilla settings so any file you view/edit in Filezilla, opens with a specific application.

Sublime for mac m1