I'm currently using TortoiseSVN to do a merge of two branches and I've found that its not smart enough to handle a specific merging senario. In one branch I have a method as follows: MyMethod(parameter1, parameter2, parameter3) In the other branch I have the same method as follows: MyMethod(parameter1, parameter2, parameter4) Tort...
I use TortoiseSVN for version control. In a working cooy I have been working with for weeks, I suddenly see a number of "changed" files showing up in the "SVN commit.." dialog that I have definitely not touched and which do not contain any real differences: I have not changed these files' encodings not performed any other operation on...
I have a whole bunch of pairs of files that have subtle differences. We use subversion for a source control, and I like the Merge/Diff utility that comes with TortoiseSVN for windows. And I can use this utility to manually compare/merge two files together. My question is this: How can I programmatically merge two files together the s...
Is it possible to set up TortoiseMerge (comes with TortoiseSVN) to be the external merge tool that pops up when you encounter a merge conflict using the "svn merge" commandline? I have tried setting my environment variable "SVN_MERGE" to point to TortoiseMerge.exe, but this doesn't seem to be enough. TortoiseMerge just pops up when I cho...
Hello, I am attempting to merge a large quantity of files. Several of these files are in conflict and TortoiseMerge is the tool of choice. When I view the code in the "merged" windows it shows me all the code that was deleted and added as well as ??? for code that is in-conflict. I am not really sure why it shows me the deleted code, b...
Hi all, I have been experiencing a problem with tortoise . when i checked out the code the tortoise icons usually green or red on the folders are not coming.Any solution??? Thanks in advance. ...