/* Code Comments */8 posts tagged with "git rebase"
git rebase: resolving conflicts after squash on stacked diffs
2022-11-28
|~4 min read
|780 words
Problem Statement Imagine you’re working on a stacked diff - a change set that builds on another change set that has not yet been merged to…
writing better commit messages
2022-11-28
|~6 min read
|1108 words
In a recent sprint retrospective, a teammate mentioned that we could help ourselves by adding more context to our pull requests. This got me…
git rebase on rebased branches and other fun, redux
2022-11-28
|~6 min read
|1153 words
Intro I’ve previously looked into different strategies for reconciling branches once an underlying branch has been rebased (see Git Rebase…
git rebase --onto and other fun
2022-11-28
|~7 min read
|1397 words
Update I wrote a follow up to this walking through similar examples in Git Rebase On Rebased Branches and Other Fun, Redux. Recently, I ran…
git: rebase origin
2022-11-28
|~2 min read
|303 words
At Olo, we rebase our commits rather than merge to keep a cleaner git history. As with all things, there are some tradeoffs to this approach…
git rebase: difference between squash and fixup
2022-11-28
|~1 min read
|141 words
The more I get into interactive rebases, the more questions I have about how all of the options work. In particular, one question I wasn’t…
git commit: fixup and squash automatically
2022-11-28
|~5 min read
|873 words
Of late, I’ve been getting more and more interested in learning about how to write better commits. This has led me to discover not only how…
git rebase: an interactive tour
2022-11-28
|~12 min read
|2379 words
A few months ago I wrote about wanting to get more familiar with when I was learning to write better commits. I didn’t follow up on my…