What do you understand about the Git merge conflict?

[olx24]

Short answer.

[montasim]

A Git merge conflict is an event that occurs when Git is unable to resolve the differences in code between the two commits automatically.

Git is capable of automatically merging the changes only if the commits are on different lines or branches.

[fcasamento]

Conflicts often arise when two people change the same lines in a file, or if one developer deleted a file while another was modifying it. Git makes this look easy to resolve by showing what the conflicts are.

[montasim]

@fcasamento Try answering the questions that have no accepted answer. That way you will get unlock the next version of the Galaxy Brain badge.