Resolving Conflicts

What is a Merge Conflict?

A merge conflict happens when Git cannot automatically resolve differences between two branches during a merge. This typically occurs when:

• Two branches modify the same line in a file.

• One branch deletes a file that the other branch modifies.

• A file is renamed or moved differently in both branches.

Conflicts require manual intervent…