Merging ta haɗu da sauye-sauyen daga reshe ɗaya zuwa wata — galibi ta dawo da rasha na fasalin da aka gama zuwa reshen mani. Git ta sarrafa yawancin merges ta atomatik, amma gane nau'in merges da conflicts yana da mahimmanci.
Haɗi-haɗin asali
git switch main # be on the branch you want to merge INTO
git merge feature-x # merge feature-x's changes into main
Ka juyawa zuwa reshe (wanda ke karɓar sauye-sauye) kuma haɗa reshe a cikinsa.
