I just don't see which was missed in this case. It would seem that either there is something I missed installing on the remote or there is a configuration that I missed that tells it to "temp copy" the files to my local then run diffmerge on my local then return the remote files to the remote. If test "$merge_keep_temporaries" = "false" The file throwing the error is /usr/lib/git-core/git-mergetool which I traced to this line in that file which is apparently running the above command from the command line and isn't finding diffmerge on the remote machine cuz it isn't installed on the remote machine cuz it was installed on my local machine: if ! run_merge_tool "$merge_tool" "$present" It appears that this is the actual command that git uses to run diffmerge: =diffmerge -merge -result="$MERGED" "$LOCAL" "$(if test -f "$BASE" then echo "$BASE" else echo "$LOCAL" fi)" "$REMOTE" =diffmerge -merge -result="$MERGED" "$LOCAL" "$(if test -f "$BASE" then echo "$BASE" else echo "$LOCAL" fi)" "$REMOTE" This is the git config portion that relates to diffmerge: diff.tool=diffmergeĭ=diffmerge "$LOCAL" "$REMOTE" I don't see where diffmerge actually installs anything on the remote at all. When I have an SSH terminal connected to a remote server, such as the CodeAnywhere server, and I run "git mergetool" it apparently then runs /usr/lib/git-core/git-mergetool which is not finding diffmerge on the remote system. The command that I run (when there is a git conflict to resolve) is: git mergetool Git config -global 'diffmerge -merge -result="$MERGED" "$LOCAL" "$(if test -f "$BASE" then echo "$BASE" else echo "$LOCAL" fi)" "$REMOTE"' Git config -global 'diffmerge "$LOCAL" "$REMOTE"' The configs that I ran are: git config -global diff.tool diffmerge Merge of app/Http/Controllers/WizardController.php failedĪny ideas? Is there a different config that’s needed or something….? usr/lib/git-core/git-mergetool: 1: eval: diffmerge: not found Hit return to start merge resolution tool (diffmerge): I have installed DiffMerge on my Mac and configured git to use it per their instructions and it works well.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |