Best IT Recipes

What is A, B and C in the KDIFF Merger

Why do I give three options when merging my code with someone else? Shouldn't it just be my code, the code of the other person and the output below? The documentation for KDIFF does not help me understand.

+47
version-control merge kdiff3
Oct 25 '10 at 20:15
source share
4 answers

It looks like you're doing a three-way merge , so A should be the base version that B and C are based on, B is theirs, and C is yours (I believe B and C can be opposite, though).

+22
Oct 25 '10 at 20:23
source share

A refers to the version on which your merge target is based. If you merge from branch to trunk, "A" will be the previous version of the trunk.

B is what you currently have in your local folder, including local changes.

C is the version you want to merge over B.

+49
Aug 09 2018-11-11T00:
source share

A is your parent version with B and C as a child .
Which means that B contains the changes made to A using user1 / repo1 , and C also contains the changes to A, but by another user ( user2 / repo2 )

kdiff gives you the opportunity to choose a modification from b or c (or take both) or from the parent also "A"

+9
Oct. 31 '11 at 6:16
source share

A (BASE) & dash; & dash; > The source file, which is now in the remote repo.
B (LOCAL) & dash; & dash; > Your file. This shows only your changes compared to A.
C (REMOTE) & dash; & dash; > Their file. This shows only their changes compared to A.

If the changes are on different lines of code, you take both from B and from C. If the changes are on the same lines of code (conflict), you take either from B or C.

+2
Oct 05 '17 at 5:56 on
source share


More articles:


All Articles