10/14/2023 0 Comments Git araxis merge![]() ![]() Why is everything so hard I hate to write commands so what I did? Path = C:/Program Files/Perforce/p4merge.exeĬmd = \"C:/Program Files/Perforce/p4merge.exe\" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" Merge of protected/views/layouts/main.php failed ![]() Protected/views/layouts/main.php seems unchanged. Hit return to start merge resolution tool (p4merge):Ĭ:\Program Files (x86)\Git/libexec/git-core/mergetools/p4merge: line 8: p4merge: Normal merge conflict for 'protected/views/layouts/main.php': gitconfig, but there i get this error when the p4merge tool suppose to opem those two files that are in conflict. Error with p4merge merging tool in git I have setup my classpath for p4merge an set the file.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |