To do this, open the PDF comparison application page in your browser, select the source file and the file you want to compare, click the "Compare" button. It takes a few more seconds to launch the IntelliJ merge tool than to launch FileMerge, but it is definitely worth waiting.You can compare two PDF documents online using the web application. Open the ~/.gitconfig file with your favorite editorĪdd these lines somewhere in the config: Ĭmd = /Applications/IntelliJ\\ IDEA.app/Contents/MacOS/idea diff $(cd $(dirname \"$LOCAL\") & pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") & pwd)/$(basename \"$REMOTE\")Ĭmd = /Applications/IntelliJ\\ IDEA.app/Contents/MacOS/idea merge $(cd $(dirname \"$LOCAL\") & pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") & pwd)/$(basename \"$REMOTE\") $(cd $(dirname \"$BASE\") & pwd)/$(basename \"$BASE\") $(cd $(dirname \"$MERGED\") & pwd)/$(basename \"$MERGED\") To manually change the mergetool for git in general follow these steps: Merge Command: /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea merge Arguments: $(cd $(dirname "$LOCAL") & pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") & pwd)/$(basename "$REMOTE").Paste the following commands into the textfields:ĭiff Command: /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea diff Open the SourceTree preferences and select the Diff tabĬhoose Custom both as Visual Diff Tool and as Merge Tool It is quite simple to configure SourceTree to use it as the default mergetool: The merge tool that ships with JetBrain's IntelliJ IDEA or WebStorm is really awesome and way better than FileMerge. Use IntelliJ or WebStorm as git mergetool Configure Sourcetree
0 kommentar(er)
