Merging nggabung owah-owahan saka siji branch menyang branch liyane — biasane nggoleki completed feature branch bali menyang main branch. Git nangani akeh-akehe merges kanthi otomatis, nanging ngerteni merge types lan conflicts iku penting.
git switch main # be on the branch you want to merge INTO
git merge feature-x # merge feature-x's changes into main
Panjenengan pindhah menyang branch (sing nampa owah-owahan) lan merge branch menyang ngene.
FAST-FORWARD merge → if main hasn't changed since the branch was created, Git just
MOVES main's pointer forward to the branch's latest commit (no merge commit, linear)
MERGE COMMIT (three-way merge) → if BOTH branches have new commits, Git creates a new
"merge commit" combining them (has two parents) → preserves that a merge happened
→ git merge --no-ff forces a merge commit even when fast-forward is possible
Git fast-forwards nalika bisa (mung ngampilake pointer) utawa nggawe merge commit (kanthi loro parents) nalika loro-lorone branches beda.
A CONFLICT happens when both branches changed the SAME lines differently — Git can't
auto-decide which to keep, so it asks YOU to resolve:
<<<<<<< HEAD
the version from the current branch (main)
=======
the version from the branch being merged (feature-x)
>>>>>>> feature-x
# resolve: edit the file to the desired result, remove the markers, then:
git add <file> # mark the conflict resolved
git commit # complete the merge
# git merge --abort # or cancel the merge entirely
Conflicts kelakon nalika loro branches ngarah baris sing padha — Git nandai lan panjenengan kanthi tangan milih hasil sing bener, banjur stage lan commit.
Nggerteni merging iku penting banget amarga nggabung owah-owahan branch iku bagian fundamental, terus-terusan saka Git workflows sing kolaboratif, dadi ngerteni kepiye cara kerjane (kalebu conflicts) iku kudu lumrahe ilmu saben dina. Merging iku cara kerja sing rampung (biasane feature branches) dadi integrated bali menyang main branch — panggawean rutin nggabung owah-owahan sing kelakon terus-terusan ing development tim.
Nggerteni bedane antara fast-forward merge (Git mung ngampilake pointer nalika target ora beda, tansah riwayat linear) lan merge commit (three-way merge nggawe commit anyar kanthi loro parents nalika loro-lorone branches duwe commits anyar, ngrewat yen merge kelakon) iku njernakake kepiye Git integrate owah-owahan lan kepiye riwayat sing asil.
Sang paling penting, nggerteni merge conflicts — sing kelakon nalika loro branches ngarah baris sing padha kanthi beda, mula Git ora bisa kanthi otomatis mutusake lan panjenengan kudu ngatasi — iku ilmu praktis sing perlu: conflicts iku bagian normal, pasti saka kolaborasi, lan ngerti carane nggenali conflict markers (<<<<<<<, =======, >>>>>>>), edit file menyang hasil sing bener, lan rampung merge (stage lan commit) iku skill sing perlu dipunya, sering-seringan saka kekhawatiran kanggo sing ora ngerteni.
Amemanggono nggabung owah-owahan branch liwat merging iku fundamental lan terus-terusan ing development kolaboratif, lan amarga ngerteni merge types lan nglaluwarkake conflicts iku kudu nggabung kerja kanthi bener (panggawean rutin, ora bisa dikasihi), nggerteni kepiye cara kerja merging — basic merges, fast-forward vs merge commits, lan conflict resolution — iku essential, Git knowledge sing sering-seringan dipakaiake, core skill kanggo kolaborasi nanging conflict resolution utamane iki iku kebutuhan praktis sing bawat developer kudu nangani kanthi percaya diri.