What is a "merge strategy" like "ours" or "recursive" used for in Git?
Correct! Well done.
Incorrect.
The correct answer is A) Merge strategies determine the algorithm Git uses to combine branches; "recursive" (default for two branches) handles renames and conflicts, while "ours" keeps the current branch's version of conflicting content, ignoring the other side's changes
Correct Answer
Merge strategies determine the algorithm Git uses to combine branches; "recursive" (default for two branches) handles renames and conflicts, while "ours" keeps the current branch's version of conflicting content, ignoring the other side's changes
Different merge strategies provide flexibility for special cases — "ours" is sometimes used intentionally to "merge" a branch while discarding its actual content changes, recording history without applying them.