Last active
April 11, 2024 12:54
-
-
Save johnnyasantoss/f0a99283a6ef428365e0cd5eab7ae99d to your computer and use it in GitHub Desktop.
JetBrains Rider as Default Merge and Diff tool
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Diff with JetBrains Rider | |
[diff] | |
tool = rider | |
[difftool] | |
prompt = false | |
[difftool "rider"] | |
cmd = D:\\\\Program\\ Files\\\\Jetbrains\\\\apps\\\\Rider\\\\ch-0\\\\181.4379.788\\\\bin\\\\rider64.exe diff "$LOCAL" "$REMOTE" | |
# Merge with JetBrains Rider | |
[merge] | |
tool = rider | |
[mergetool] | |
prompt = false | |
[mergetool "rider"] | |
cmd = D:\\\\Program\\ Files\\\\Jetbrains\\\\apps\\\\Rider\\\\ch-0\\\\181.4379.788\\\\bin\\\\rider64.exe merge $LOCAL $REMOTE $BASE $MERGED | |
trustExitCode = true |
Thanks for this! Super helpful! 👍
Amazing!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Thanks for providing a base for me to work from. I ended up going with this config setting, which detects the location of the Jetbrains Toolbox rider64.exe and waits for the difftool to exit. Run the following PowerShell commands: