I've moved a function from one file to another, and I'd like to compare the moved version to the original, so I'd like a diff with the source file on ...
I've moved a function from one file to another, and I'd like to compare the moved version to the original, so I'd like a diff with the source file on ...
Following a merge commit under SVN (Merge commit with more than 10 revisions), I want to revert a single revision from the merge commit. Is it possib ...
I'm having problems merging code into UAT environment, I get a lot of merge conflicts. I've been trying to resolve them and try to understand tortoise ...
I am having issues with my TortoiseHg when it tries to launch Kdiff3. It gives me an error "C:\Program Files\TortoiseHg\lib\kdiff3.exe: [Error 2] The ...
When using WinSCP, we can define customized commands to do task, like to compare file contents. The built-in one is: using the Windows fc(file com ...
Usually, when I encounter merge conflicts in SVN upon updating my working copy, the lines or blocks that are conflicted are highlighted in TortoiseMer ...
Steps: Use TortoiseSVN's context menu to select "Create Patch" On another machine do the same but select "Apply Patch" and select the file gener ...
I have two git branches. They've both been undergoing development separately. When I do a do a git mergetool to use Tortoisemerge to resolve some merg ...
Ive been using tortoiseMerge as external tool in source tree for a while now but today I had 3 conflicts after pull, so I fixed the first one then I w ...
Tortoise Merge 1.9.3, the difference viewer that comes with the Tortoise Subversion client, has in its settings dialogue a tick-box setting for “Enabl ...
I'm working with another team in the same central repository. They have a branch (let's call it theirBranch) which I'm not allowed to edit (can view ...
Is there any way to make TortoiseGitMerge highlighted section be same as in TortoiseMerge without resizing window? ...
Good morning In windows explorer I can see that some files of my SVN versioned project have the Tortoise conflict icon with the corresponding .mine, ...
In TortoiseMerge document, the equal sign means : A change has been undone by reverting to the original content of the line. The panel shows th ...
I was trying to merge from my branch to trunk.Merge type was Range of revision. Kept the text blank so that I need to get all the revisions merged. On ...
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 " ...
I really love the TortoiseSvn diff software. I can download them standalone as a zip, but I really love when iI can select two files and then right cl ...
I'm having troubles to commit any change after merging on pull-request from github respository. I'm using TortoiseSVN 1.7.11, Build 23600 - 64 Bit , 2 ...
Scenario: When I try to reintegrate (merge) the branch to trunk, I want to run some script before the actual merge starts. Its something like, The mo ...
What is Reverse Merge ( Revert Merge ) in SVN, a simple explanation and the step by step processes from start to finish would be great. Can someone g ...