TLDR Web Dev · ARTICLES & TUTORIALS

GIT REBASE: WHAT CAN GO WRONG?

jvns.ca13 min read

Summary from the TLDR Web Dev newsletter

It’s common for developers to face issues when using Git's "rebase" feature. Common issues include repeated conflict resolution, difficulty when rebasing many commits, the complexity of undoing a rebase, issues with force pushing to shared branches, complications in code reviews due to force pushes, and loss of commit metadata. To help solve this, the article describes varying levels of "commit discipline,” alternative workflows like the "squash and merge" approach, and the author’s personal rules for using rebase effectively.