conflictIntro.md 287 Bytes
Newer Older
Daniel Duarte's avatar
Daniel Duarte committed
1
2
3
4
5
6
7
8
9
# Theory: Conflict resolution

* A conflict emerges when two files push two different changes 
to a one target branch

* Some conflict may be resolved automatically, but major conflicts 
always need to be resolved manually

* Tools exist to streamline conflict resolutions, we use kdiff3