Why merge three folders?

If you have data in two places and want to bring it together, BC can let you visually merge everything. A special case is different versions in a version control system, like Git.

The only three way folder feature in Beyond Compare is FolderMerge (FolderCompare is limited to two folders).

The center folder has a specific purpose: BC assumes it is authoritative and ancestral to the other two folders. When there is a conflict, BC uses this precedence and some simple logic rules to make assumptions on which things you want to keep during the merge. If you know Git, this is some of how Git handles merge conflicts.

To get started with a three way merge, drag your three folders with the mouse into two or three panes.

Please note that you cannot edit in the top three panes! You are only supposed to be pressing arrow buttons: "take the left line", "take another left line", "take the middle line". Typing? No! Just pressing arrows.

Also note: this feature is not available in Beyond Compare Standard Edition.

Why is there there a (optional) middle folder? If we put a third folder in the middle we are defining it as the old musty, deprecated directory and other two as living newer directories. That way, if we get confused during our merge, we can get clarity by knowing this: the more any folders or files resemble the musty directory, the less desirable they are. Distance from this directory becomes a good thing in choosing what to keep during the merge.

In a workflow like the one shown above, we would be trying to merge 4 and 5 to make 6. When automatically evaluating what to keep, Beyond Compare will deprecate things in 4 or 5 if they resemble 1. Why? Because resembling 1 is a sign that you are old and outmoded.

Instructions:

Last updated