Most prevalent themes in the discussion
| # | Theme | Supporting quote |
|---|---|---|
| 1 | Rebase can be intimidating and risky | > "scary rebase -i commands that can leave your tree in a half‑broken state if you so much as sneeze." – skydhash |
| 2 | A curated, meaningful commit history matters | > "A commit should be such that the message can articulate the why." – jolmg |
| 3 | Understanding the “ours” / “theirs” mental model | > "When merging, you are taking change from another branch (theirs) to create a new commit on the current branch (ours) … When rebasing interactively, you switch to the new base (ours) and replay the changes of the branch (theirs) according to the edit file." – catlifeonmars |
| 4 | Alternative tools/approaches simplify history rewriting | > "A lot of people, on first encountering stgit, read a bit about it, think “why do I need this? I can do the same thing with just plain ol’ git.” … Try it for a while and you’ll find it indispensable." – smcameron |