Merging kombinira promjene iz jedne grane u drugu — obično vraćanjem gotove feature grane natrag u glavnu granu. Git automatski rukuje većinom spajanja, ali razumijevanje tipova spajanja i konflikata je važno.
git switch main # be on the branch you want to merge INTO
git merge feature-x # merge feature-x's changes into main
Prelaziš na granu (onu koja prima promjene) i spojaš granu u nju.
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 se brzo pomjera kada je moguće (jednostavno pomjeranjem pokazivača) ili kreira merge commit (s dva roditelja) kada su obje grane divergirale.
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
Konflikti se pojavljuju kada obje grane mijenjaju iste linije — Git ih označi i ti ručno odabereš ispravan rezultat, zatim staged i commit.
Razumijevanje spajanja je bitno jer kombiniranje promjena grana je temeljni, stalan dio suradničkih Git tijekova rada, tako da znanje kako funkcionira (uključujući konflikte) je nužna svakodnevna znanja. Merging je kako se gotov rad (obično feature grane) integrira natrag u glavnu granu — rutinski čin donošenja promjena zajedno koji se stalno javlja u razvoju tima.
Razumijevanje razlike između fast-forward spajanja (Git jednostavno pomjera pokazivač kada se target nije divergirao, čuvajući linearnu povijest) i merge commit (three-way spajanja koja kreira novi commit s dva roditelja kada obje grane imaju nove commits, evidentira da se spajanje dogodilo) pojašnjava kako Git integrira promjene i kako izgleda rezultirajuća povijest.
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.