Claude Code is *really* good at resolving conflicts when rebasing branches. That is definitely some work I can do without!