tags:

views:

25

answers:

0
Q: 

What do the colors when resolving conflicts in tortoise SVN signify?

I am just curious when I am resolving conflicts the red ones are the conflicts...while the yellow colour is the new code added...but then I see this orange color and white sort of blue text what do they mean? What exactly do colors in the tortoise svn while resolving conflicts signify....just out of curiosity

related questions

How do I move a file (or folder) from one folder to another in TortoiseSVN?
How do I use a start commit hook in TortoiseSVN to setup a custom log entry?
Prevent file casing problems in Subversion
Find checkout history for SVN working folder
Can I turn off automatic merging in Subversion?
How to keep Stored Procedures and other scripts in SVN/Other repository?
Can I have TortoiseSVN auto-add files?
Better Merge Tool for Subversion
Best tools for code reviews
How do you move a file in SVN?
How do I change the default author for accessing a local SVN repository?
How do I download code using SVN/Tortoise from Google Code?
How to Turn Off Sounds in Turtoise SVN
Is there anything like TortoiseCVS and TortoiseSVN for git?
TortoiseSVN side-by-side configuration is incorrect
Best way to deploy subversion (SVN) in a multisite windows environment
TortoiseSVN & Putty very slow
Can I make Subversion + TortoiseSVN case-insensitive for Windows?
VisualSVN undelete with TortoiseSVN
Resharper and TortoiseSVN
Shelve in TortoiseSVN?
Making a production build of a PHP project with Subversion
Best SVN Client Ignore Pattern for VB.NET Solutions?
Integrating Fogbugz with TortoiseSVN with no URL/Subversion backend
Good branch/merge tutorials for Tortoise SVN?