![]() ![]() ![]() Now let’s create a merge conflict, but this time, I’m going to keep my heart rate low when the (master|MERGING) appears! Btw I called my branch `conflicting` just because. $ git config –global ‘C:\Program Files\Perforce\p4merge.exe’ Thanks to these for Windows we can setup p4merge as our merge and diff tools using Git Shell (I’m using Git Bash) I’ll assume you have p4merge installed here in C:\Program Files\Perforce But why can’t you have it all on the same line? What am I missing?Īnd also, what is “mergetool”? is it yet another variable? and how does it differ from merge.tool? Set up a merge wrapper script named extMerge that calls your binary with all the arguments provided So why need two lines? Perhaps I’m not recalling enough of my shell programming or the translation fails over to Windows? The instructions say 'extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"' These are the two lines I get stuck on: $ git config -global merge.tool extMerge The journey to 3rd degree black belt starts with a single punch. Yes I know there are others, but for now, I’m going to follow these instructions. I’m going to assume you’ve installed p4merge. Let’s start by engaging in epic battle with the git-scm instructions. The mentor wizard person (because there’s always a mentor wizard person) would tell you, “Aren’t you strong enough to defeat the DragonLord?”Īs I debated whether I knew enough to write a tip about configuring your git diff and merge tools, I ask myself “Aren’t you strong enough to defeat the git diff merge config tool?!”įor today’s tip, I’m using the git-scm instructions and this translation for Windows At level 30, you couldn’t gain any more experience points. One of my favorite Nintendo NES games was Dragon Warrior.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |