Merge conflicts hutokea wakati Git haiwezi automatically kuunganisha mabadiliko kutoka branches mbili. Hii ni kawaida wakati developers wameshabadilisha sehemu ile ile ya file kwenye branches tofauti. Kujua jinsi ya kutatua merge conflicts ni muhimu ili kudumisha codebase safi na stable.

Mifano ya hatua za kutatua Merge Conflicts:

# Kwenye branch yako ya feature, fanya merge na main
git checkout feature/login-system
git merge main


Ikiwa kuna conflict, Git itakuonyesha files zilizo na conflict.

Fungua file zilizo na conflict. Git itatumia markers kama hizi:

<<<<<<< HEAD
// Code uliyo kwenye branch yako
=======
// Code kutoka branch ya main
>>>>>>> main


Ondoa markers na chagua code unayotaka kuweka. Unaweza pia kujoin code zote.

Baada ya kurekebisha, save file na run:

git add path/to/conflicted-file
git commit -m "Resolved merge conflict in login system"


Sasa merge imekamilika na codebase iko safi.

Tips:

Kila wakati before merge, fanya git pull ili kuwa na latest changes.

Tumia tools za GUI kama VSCode, GitKraken, Sourcetree ambazo zinafanya conflict resolution iwe rahisi.

Fikiria ku-test code baada ya resolving conflicts ili kuhakikisha functionalities hazijaathirika.

🔗 Links Za Kujifunza Zaidi:

🌐 Faulink Official Website:
https://www.faulink.com/

📘 Jifunze Web Design & Programming (Tutorials / Mifumo):
https://www.faulink.com/excel_mifumo.php

📲 Piga / WhatsApp kwa msaada wa haraka:
https://wa.me/255693118509