Merge (EN)

Definition

Merge is a strategy for integrating branches where commits from both branches are combined and the complete history is preserved. During a merge, a new merge commit is created that documents the combination of the two branches. This approach maintains the entire history and makes it traceable when and why changes were merged. Merge is particularly useful when the complete development history is important or when multiple commits from one branch need to be integrated into another.

In Context

• Typically used together with Git, branches, and commits
• Related to: Rebase, Cherry-Pick, Fast-Forward
• Example use case: Merging a feature branch into the main branch after development is complete