Language: Deutsch · English
Git conflict management
Merge branches safely – squash test merge, real merge and conflict resolution.
HOW-TO DEVELOPER UPDATED: JUL 2026 APPLIES TO NUCLOS 4.2026.X
On this page
How to merge one branch into another (example: 3.12 into 3.13).
Test merge (squash)
First run a test merge to detect conflicts without committing the result:
# Remote-Heads aktualisieren git fetch # Auf den Ziel-Branch wechseln git checkout 3.13 # Testmerge ohne Ergebnis einzutragen git merge --squash origin/3.12
Real merge
git fetch git checkout 3.13 # Merge, der das Ergebnis sofort einträgt (falls keine Konflikte) git merge origin/3.12
Resolving conflicts
If conflicts occur, resolve the files manually (or with a merge tool such as kdiff3), then git add and git commit.
Related pages
Überblick
Inhalte