Using Git's rerere feature to escape recurring conflict hell
Summary
Explains how Git's rerere feature automatically resolves recurring merge conflicts, saving time during frequent rebases or merges.
Similar Articles
git rebase -i is not that scary
Explains the interactive rebase command in git, demystifying its functionality and emphasizing safety with abort and reflog.
Accepting a messy git history
A blog post discussing two git workflow philosophies—commit often vs rebase carefully—and why a messy history is acceptable given resilience in larger teams, referencing GitHub's new stacked PR feature.
How Jujutsu Rethinks Git's Working Copy and Conflict Model
Jujutsu (jj) is a new version control system that rethinks Git's working copy and conflict model, offering a more coherent workflow while maintaining full Git compatibility.
The Git history command deserves more attention
The article highlights the new `git history` command with `fixup`, `reword`, and `split` subcommands, which provide atomic and branch-aware editing of commit history, offering benefits similar to jj without requiring a version control switch.
Why don't people use git properly?
An essay exploring why many developers struggle to use git properly, covering common mistakes like panic over merge conflicts, huge commits, and poor branching practices, and examining the root causes.