Conflict resolution

say it: “KON-flikt rez-uh-LOO-shun” /ˈkɑnflɪkt ˌrɛzəˈluʃən/

The chosen final content that replaces competing changes in a merge or rebase conflict.

What is Conflict resolution?

Conflict resolution — The chosen final content that replaces competing changes in a merge or rebase conflict.

Level: Apprentice · More Git terms at this level

Updated

In other subjects