| Auszug |
|---|
|
Nuclos Git merge: conflict, git merge, squash, git fetch, checkout, kdiff3, branch, conflict management. |
Language: Deutsch · English
Git conflict management
Merge branches safely – squash test merge, real merge and conflict resolution.
| Status |
|---|
| colour | Green |
|---|
| title | Updated: Jul 2026 |
|---|
|
| Status |
|---|
| colour | Grey |
|---|
| title | applies to Nuclos 4.2026.x |
|---|
|
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:
| Codeblock |
|---|
|
# 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
| Codeblock |
|---|
|
git fetch
git checkout 3.13
# Merge, der das Ergebnis sofort einträgt (falls keine Konflikte)
git merge origin/3.12 |
| Info |
|---|
|
If conflicts occur, resolve the files manually (or with a merge tool such as kdiff3), then git add and git commit. |
Related pages
