DEV Community


Merge conflicts and learn how to resolve it in git.

ajeetht profile image Ajeeth thangarasu ・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)

Forem Open with the Forem app