TinkerMain and sale, both changed the drill press.5 commits · on main
Chapter 5 of 7
Both changed it
This time Tom raised the drill press price on main, while Mira’s sale branch cut it.
This chapter: What happens when both sides change the same line?
About this chapter
You will learn
- A conflict: one line, two answers
- Git stops and a person chooses
- The merge commit keeps the choice
Words you’ll meet
- Conflict
- The same part of a file changed differently on both sides, so Git can’t choose.
Step 1 of 5
Tom raised the drill press on main; the sale branch cut it. Same line, two answers.
Predict what the merge does.