I have been using TortoiseSVN, svn, and subclipse and I think I understand the basics, but there's one thing that's been bugging me for a while: Merging introduces unwanted code. Here's the steps. trunk/test.txt@r2. A test file was created with 'A' and a return: A [EOF] branches/TRY-XX-Foo/test.txt@r3. Branched out the trunk to TRY-X...
I currently use RCS' merge command to do 3-way merges, but one thing has always annoyed me about it. If I use the -A option, the same change made in both files shows up as a conflict: <<<<<<< file1 file1 line 1 ||||||| orig orig line 1 ======= file2 line 1 >>>>>>> file2 orig line 2 <<<<<<< orig ======= line added in both changes >>>>>>>...
I saw this posting which explained how to get BC3 working as the diff tool for Subversion... but what about using Beyond Compare 3 to do 3-way merge/compares? ...
Does anyone know of an Open Source three-way merge implementation in JavaScript or PHP? I want to merge plain text files without the need to rely on any server side binaries. I found a few solutions for creating diffs, but no merge implementations. ...
I've been a user of UltraCompare Pro since it first came out, and I think it's a very full-featured compare and merge tool. However, since I have been looking more closely into DVCS, I found that it handles three-way merges differently than (most?) other tools out there. So I wonder why that is, and whether I'm missing something because ...
Hello, I have a dir with thousands of files and 2 patch files that apply to the same dir. Each patch file patches 20-30 files in dir or it's subdirs. If I apply either patch to the common ancestor dir, it succeeds. But if I apply one patch file followed by the other, it fails because the line numbering has changed after one patch fil...
The situation is as follows: it is necessary to merge in changes from an upstream code base (from V1, to V2), into a third code base S1 that is derived/branched from V1, to produce a new code base S2. We have access to version control for logs and revisions between V1 and V2, and the source of V1, V2 and the source of S1. However, S1 is...