Merge-Konflikt (EN)

Concept

Situation where Git has made different changes to identical lines in different branches

Merge-Konflikt

Merge conflicts occur when Git cannot automatically decide how to merge changes because identical lines have been changed differently in both branches. They typically occur when two developers have modified the same code sections in different branches and these branches are merged. Resolving merge conflicts requires manual intervention where you identify conflict markers in the code and choose the desired version or combine both changes. After resolving, you must mark the conflict files as resolved and create a new commit to complete the merge.

Im Kontext

Wird typischerweise zusammen mit Git, Branching und Version Control verwendet
Verwandt zu: Rebase, Commit, Pull Request
Beispiel-Einsatz: Zusammenführung von Feature-Branches in den Main-Branch

Quelle: AI Generated