How to use Git - Git Video Tutorial - Part 4 (Merge Conflicts)

[prajsd]

Hi. I use GitBash for windows. I tried running git config color.ui true but I got an error saying "error : could not log config file. .git/config: No such file or directory. I am not a programmer so kindly explain in layman's terms as to what I need to do to get the colors. I am really fascinated with the way it appears in your videos.

[thejacenxpress]

@prajsd Hey there, so if it can't find the config file that most likely means you're not in the correct directory. You need to run that command inside of your project folder. If that still does not work send me a private message and we'll figure it out.

[Zorobay]

When i type git mergetool i only get 3 alternatives; " tortoisemerge emerge vimdiff" then i says; "No known merge resolution program available."....what?!

[Espersontheone]

Yes we watched 3.5 ^^