概要
This Claude Code skill streamlines the process of keeping feature branches up-to-date with the primary branch (main or master). It handles the tedious manual steps of fetching origin, updating local tracks, rebasing the current branch, and intelligently resolving merge conflicts by analyzing code context. By using safety-first commands like force-with-lease, it ensures a clean commit history without risking unintentional data loss, making it an essential tool for maintaining high-velocity development workflows and a linear Git history.
