Posted
by NitroxDM
on Super User
See other posts from Super User
or by NitroxDM
Published on 2010-04-09T20:05:17Z
Indexed on
2010/04/09
20:13 UTC
Read the original article
Hit count: 350
How can I make the 3rd (merge preview) pane in TortoiseMerge bigger? Right now it shows 2 lines.
© Super User or respective owner
as seen on Stack Overflow
- Search for 'Stack Overflow'
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…
>>> More
as seen on Super User
- Search for 'Super User'
How can I make the 3rd (merge preview) pane in TortoiseMerge bigger? Right now it shows 2 lines.
>>> More
as seen on Super User
- Search for 'Super User'
I need to combine (merge?) some parts of an old revision with a newer revision of a file. I'm still pretty new to subversion, so I'm not sure what I'll bomb in the process.
I did not branch--these are simply different revisions of a file. How do I send the sections of code from r1 to r3 where they…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution?
In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts.
The default parameters are:
"${yours}" "${theirs}" "${base}" "${merged}"
And…
>>> More
as seen on ASP.net Weblogs
- Search for 'ASP.net Weblogs'
For this example I am using Visual Studio 2010, TortoiseSVN 1.6.6, Subversion 1.6.6 and AnkhSVN 2.1.7819.411, so if you are using different versions, some of these screen shots may differ. This is assuming you have your code checked in to the trunk directory and have a standard SVN structure of trunk…
>>> More
as seen on Super User
- Search for 'Super User'
I keep getting this error when trying to install TortoiseSVN on Windows 7.
All Windows-help documents refer to Windows XP for this error code and they don't work with Windows 7.
What does this message mean?
Note: my version number is TortoiseSVN-1.6.7.18415-win32-svn-1.6.9
EDIT: just tried installing…
>>> More
as seen on Super User
- Search for 'Super User'
I want to copy all tortoisesvn related settings from one machine to another. Where are these stored?
Update:
While some of the settings are stored at HKEY_CURRENT_USER\Software\TortoiseSVN as stated below, there are other settings that are not. Comments seem to indicate these are Subversion specific…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
Currently im setting up TortoiseSVN and reading through docs etc.
The manual often mentions svnadmin.
I figured out, that I have to download it seperatly.
But the link seems to be old.
After some browsing I got here.
But I can't find a version 1.6.7, like my TortoiseSVN installation.
Also I'm a little…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I have a branch checked out in Tortoise 1.4.2, edited it in 1.6.2 and now can't modify it on my old machine running 1.4.2. The latest version on the Tortoise website is 1.6.7. Are versions 1.6.x interoperable? I'm stuck with version 1.6.2 on my new machine.
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
What is the difference between the following while using Tortoise SVN
SVN Checkout (in context menu)
Export (in context menu)
Save as (in Repo Browser)
Copy to.. (in Repo Browser)
Copy to working copy.. (in Repo Browser)
>>> More
