It can also help you resolve a conflict by showing you your file, the file which has been modified by someone else and the file as it was before any of you have modified it, in its original state. Resolving conflictsīut that's not all TortoiseMerge is able to do for you. It always shows whitespace characters with special chars, and of course it's very handy if you have long lines because that view has the double width than the normal views.
If you see such a white circle, you know that no real changes were made, only changes in whitespaces.Īt the bottom of the window, there is a view showing the two lines your mouse pointer is currently hovering over. TortoiseMerge marks such changes with a white circle on the left gray bar of each view. When you reformat your code or text, sometimes you don't really change anything but only split a long line into multiple ones, or you merge multiple lines into one. You can see in that screenshot that TortoiseMerge also colors the changes inside modified lines so you can see immediately what exactly has changed. It shows you the two versions of a file side-by-side, coloring every modified line in that file. Diffing filesĪt least for files which consist of text, TortoiseMerge can help you here. It is a diff / merge software tool for Windows with a tight integration for TortoiseSVN. But to really see and check the history, you must be able to see and check what has changed between two points in time, for example what has changed between two releases of your product, or what was changed to fix a bug, or. Version control is all about having the history of your working progress.
0 kommentar(er)
