TinkerMain after sale, then shelf, then hinge: 0 conflicts, 9 commits.9 commits · on main
Chapter 7 of 7
Bring three branches in
Friday: three branches wait to join main, Mira’s sale, and Tom’s shelf and hinge work. Others already have the sale.
This chapter: Which way and order brings all three in with no conflicts and the shortest history?
About this chapter
You will learn
- Merge what others have; rebase what only you have
- A rebase can meet conflicts a merge never sees
- Why more than one plan can be equally good
Words you’ll meet
- Shared branch
- A branch others already have and may have built on.
Step 1 of 2
Mira’s sale is a : never rewrite it. Aim for no conflicts, then the shortest history.
Bring all three branches in.
0 conflicts · 9 commits on main BEST IS 0 · 8
sale, by Mira (shared)
shelf, by Tom
hinge, by Tom
| Branch | What happened | Conflicts | Commits added |
|---|---|---|---|
| sale | label moved up | 0 | 1 |
| shelf | merge commit | 0 | 3 |
| hinge | merge commit | 0 | 2 |
A conflict on the bench is resolved to the incoming side, a stand-in for a person choosing.
Larkspur’s repo is written for this site, with fixed people and times; every hash is the one real Git gives it.