Three-way merge

Card Puncher Data Processing


Three-way merge allows concurrent development. 1)

It involves three files:

  1. The (Original|Received|Master|Parent) files: the original local file before modification.
  2. The Target/Modified File: the local file with your modifications.
  3. The Current/Production File: Generally, the file that is in production and where some modifications may have been performed by other people.


The merge process involves three steps :

  • Comparison between the current and the target file to find out your modifications
  • Conflict Resolution or Reconciliation (if any). You must decide which modifications are applied.
  • Merge. The last step is where you just start the merge action.

Discover More
Obiee Repository Merge Menu
OBIEE - Merge Repository (SCM)

The Oracle BI repository development process adheres utilizes a three-way merge to manage concurrent development. The merge process involves three repositories: The (Original|Received|Master|Parent)...
Branches Git
Git - Branch

This page talks Branch management in Git. For Git, a branch is: a commit name (ref) that points to the last commit (head) leaf in the commit log (or log) that represents a commit chain Example...

Share this page:
Follow us:
Task Runner