Bagaimana cara kerja penggabungan dalam Git?

Question

Accepted Answer

**Merging** menggabungkan perubahan dari satu cabang ke cabang lain — biasanya membawa cabang fitur yang selesai kembali ke cabang utama. Git menangani sebagian besar penggabungan secara otomatis, tetapi memahami jenis penggabungan dan **konflik** adalah penting. ## Penggabungan dasar ```bash git switch main # be on the branch you want to merge INTO git merge feature-x # merge feature-x's changes into main ``` Anda beralih ke cabang **target** (yang menerima perubahan) dan menggabungkan cabang **source** ke dalamnya. ## Fast-forward vs merge commit ```text 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 melakukan fast-forward jika memungkinkan (hanya memajukan penunjuk) atau membuat **merge commit** (dengan dua induk) ketika kedua cabang telah menyimpang. ## Konflik penggabungan ```text 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: ``` ```text <<<<<<< HEAD the version from the current branch (main) ======= the version from the branch being merged (feature-x) >>>>>>> feature-x ``` ```bash # resolve: edit the file to the desired result, remove the markers, then: git add # mark the conflict resolved git commit # complete the merge # git merge --abort # or cancel the merge entirely ``` **Konflik** terjadi ketika kedua cabang mengubah baris yang sama — Git menandainya dan Anda secara manual memilih hasil yang benar, kemudian stage dan commit. ## Mengapa ini penting Memahami penggabungan sangat penting karena menggabungkan perubahan cabang adalah bagian fundamental dan konstan dari alur kerja Git kolaboratif, jadi mengetahui cara kerjanya (termasuk konflik) adalah pengetahuan sehari-hari yang diperlukan. **Merging** adalah cara pekerjaan yang diselesaikan (biasanya cabang fitur) diintegrasikan kembali ke cabang utama — tindakan rutin untuk menyatukan perubahan yang terjadi terus-menerus dalam pengembangan tim. Memahami perbedaan antara **fast-forward merge** (Git hanya memajukan penunjuk ketika target belum menyimpang, menjaga riwayat linear) dan **merge commit** (penggabungan tiga arah yang membuat commit baru dengan dua induk ketika kedua cabang memiliki commit baru, mencatat bahwa penggabungan terjadi) menjelaskan bagaimana Git mengintegrasikan perubahan dan bagaimana riwayat yang dihasilkan terlihat. Most importantly, understanding **merge conflicts** — which occur when both branches change the same lines differently, so Git can't automatically decide and asks you to resolve — is crucial practical knowledge: conflicts are a normal, inevitable part of collaboration, and knowing how to recognize the conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`), edit the file to the correct result, and complete the merge (stage and commit) is an essential skill that's often a source of anxiety for those who don't understand it. Since integrating branch changes via merging is fundamental and constant in collaborative development, and since understanding merge types and especially resolving conflicts is necessary to combine work correctly (a routine, unavoidable task), understanding how merging works — basic merges, fast-forward vs merge commits, and conflict resolution — is essential, frequently-applied Git knowledge, a core skill for collaboration where conflict resolution in particular is a practical necessity every developer must handle confidently.