Best sourcetree merge tool8/26/2023 ![]() To display a description of the change including the diff in the Git Show view. When I set up Source Tree to use P4Merge, my gitconfig getsĬmd = /Applications/p4merge.app/Contents/MacOS/p4merge “$LOCAL” “$REMOTE”Ĭmd = /Applications/p4merge.app/Contents/MacOS/p4merge “$BASE” “$LOCAL” “$REMOTE” “$MERGED”Īnd I get context sensitive menu items to launch external diff tool and external merge tool. You can use the Gerrit code review tool for projects that use Git. It would be great to see the ability to set up / configure an external diff tool and external merge tool in sublime merge like is done in source tree. I tried going the route of setting up a menu item for diffs, but i did not have any luck. It also guesses well with regard to what to do with conflicts. It doesn’t just provide the hunk where there is a difference, it shows the complete file. Sublime Merge is a tool in the Source Code Management Desktop Apps category of a tech stack. ![]() I do that and utilize P4Merge for both diffs and merges.įor me, P4Merge is a better tool for managing diffs and merges than any other diff or merge tool I have used. Source Tree (macos gui git tool) allows one to set up an external diff tool and an external merge tool. ![]() (1) sublime merge does not allow one to configure an external diff tool to use instead of built in tool and (2) sublime merge does not allow one to configure an external merge tool to use instead of built in tool. I have been trying to migrate from SourceTree (macos git gui tool) to sublime merge however, there are two main stumbling blocks for me to do this.
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |