Git · Middle · Question 67 of 75

Where should you resolve a `package.json` version conflict between two feature branches?

1In both branches simultaneously before merging either
✓Correct answer: In the branch merged later, after updating it from main
3Directly on main with a force-push

Explanation

The second branch to land is responsible for integrating with what's already on main: update, resolve, re-run tests, then merge.

Further reading

Test yourself

Take the Git · Middle quiz: questions and options are shuffled, and you get a review of your mistakes at the end.