Base mine

Question

Now I have suggestions on my other question, and I'm trying to combine my function branch with a working copy of the trunk in the working copy of the trunk directory. Due to several conflicts, I use KDiff3 to resolve them. However, I'm not sure what Base, Mine and them mean here. In my case (merging a branch onto a trunk):

Mina --- a working copy of the barrel,

Base --- ???

Them ---???

Another main question: After resolving conflicts and saving, the edited version will be saved in the local working copy of the trunk. Do I understand correctly?

In fact, I sometimes looked for others to avoid the simple questions that are forwarded here. However, I cannot find any simple explanations regarding these fictitious questions.

Answer 1

Base, Mine And Theys are just three names in three-way-diff. You can use any copy in any field of those (basic, mine, mine). But it makes sense to do like this:

• Base: repository version of your check
• My: editing your working copy
• Theirs: conflicting version

This means that you have a version that you checked in your working directory. You have changed it and before you can complete the transaction, you must combine the changes made by others in your working copy. Thus, you do three-way-diff to see the original (base) and your edits (Mine) compared to the conflicting changes (them). You will go through it and combine it into your version in your working copy.

When you are done, you will test it (compile or something else that you need to check) and commit it.

three-way-diff in the kdiff3 documentation: http://kdiff3.sourceforge.net/doc/documentation.html#id2488370

And an explanation in the svn book: http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4