Syncs local feature branches with remote main and automates intelligent merge conflict resolution.
The Pull skill streamlines the process of updating local feature branches by pulling changes from origin/main and managing the complexities of merge conflicts. It leverages advanced git configurations like rerere and zdiff3 to provide high-clarity conflict markers, allowing Claude to make informed decisions based on codebase rules and project intent. Designed with a focus on reliability, it includes integrated verification steps such as compilation checks and test suite execution to ensure that the merged code remains stable and production-ready.
Key Features
01Automatic configuration of git rerere to remember and reuse conflict resolutions
025 GitHub stars
03Automated syncing with origin/main using fast-forward and merge workflows
04Integrated verification via mix compilation and test suites for Elixir projects
05Advanced conflict visualization using zdiff3 for clearer base/ours/theirs context
06Domain-specific resolution guidance for state machines and bitwise operations
Use Cases
01Keeping a long-lived feature branch updated with the latest changes from the main branch
02Automating the fetch-merge-test-verify cycle during collaborative development
03Resolving complex merge conflicts that require understanding of the underlying code intent
