DEV Community


Merge conflicts and learn how to resolve it in git.

Ajeeth thangarasu
I am not smart but try to learn new things
・1 min read

Merge conflicts occurs when we try to merge two branches of same files altered. This usually can occur between team members. Take a 5 mins read.

Discussion (0)