Quiz 7 Question 12 of 20

Water utility engineers open a pull request where one branch renames a meter column and another updates a dependent view that still references the old name. What is the correct conflict-resolution approach?

Select an answer to reveal the explanation.

Motivation