More on Merge conflicts

[IOutis]

Can you show how merge conflicts look like??

[sanjay-kv]

sure i can cover this

[pasindupiumal03]

@IOutis

🔹 How merge conflicts look in Git

When a merge conflict happens, Git marks the conflicting lines in the file like this:

<<<<<<< HEAD
This is your change in the current branch.
=======
This is the change from the branch you’re merging.
>>>>>>> feature-branch

Everything between <<<<<<< HEAD and ======= is your version.

Everything between ======= and >>>>>>> feature-branch is the other branch’s version.

👉 You resolve it by editing the file, keeping the correct lines (or combining them), then saving and committing again.

[IOutis]

Done @pasindupiumal03