Menu
Why am I given three choices when merging between my code and someone else's? Shouldn't there just be my code, the other person's code, and the output below? The documentation for KDIFF doesn't help me understand.
730
Choosing Input A, B, or C for All Conflicts If you want to decide every single delta yourself, you can "Set deltas to conflicts". Or if you want to return to the automatic choices of KDiff3 then select "Automatically solve simple conflicts". KDiff3 then restarts the merge.
It is the first common ancestor. Often it is useful to have this to help decide which of the newer commits you want. Local is your local commit, the one in the current branch you are standing on. Remote is the remote commit, of the branch you are merging into your local one.
KDiff3 is a file and directory diff and merge tool which compares and merges two or three text input files or directories, shows the differences line by line and character by character(!), provides an automatic merge-facility, has an editor for comfortable solving of merge-conflicts, provides networktransparency via ...
LOCAL : the "ours" side of the conflict - ie, your branch ( HEAD ) that will contain the results of the merge. foo. REMOTE : the "theirs" side of the conflict - the branch you are merging into HEAD. foo. BASE : the common ancestor.
A refers to the version your merge target is based on. If you Merge from branch to trunk, 'A' will be the previous trunk version.
B is what you currently have in your local trunk folder, including local changes.
C is the Version you wanna merge on top of B.
119
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
