Real-world example:?
Two developers edit the same line in README.md — one changes “version 1.0” to “1.1,”
another to “v2.0.” Git will stop and ask you to pick which to keep.
Two developers edit the same line in README.md — one changes “version 1.0” to “1.1,”
another to “v2.0.” Git will stop and ask you to pick which to keep.