Menu
What do the colors mean when resolving conflicts in TortoiseGit?
E.g: There's a conflict in a file, and there's text highlighted with orange in the "theirs" window, and yellow in the "mine" window. And of course, the red text highlighted.
My confusion is that I'm not sure what code from each file is being added to the final file.
I've looked online for a definition of what the different colours mean, or a settings page to customize them (which would be equally good) but I can't find either.
269
A merge conflict usually occurs when your current branch and the branch you want to merge into the current branch have diverged. That is, you have commits in your current branch which are not in the other branch, and vice versa.
Wow...I feel sheepish. In the Tortoise git diff window, in the top left, there's an arrow pointing down. Clicking this opens "Settings" with a tab for "Colors".
123
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
