skills.rest
johngrandson
johngrandsonCOMMUNITY
Explore all skills by this author →
Website𝕏@johngrandsoonGitHub

pull

Merge origin/main into the current branch with rerere-enabled conflict resolution.

Updated Aug 23, 2026
Search Tags:#git#workflow#merge#pull#branch-management#conflicts
One-click install
npx skills add https://github.com/johngrandson/orkestry --skill pull-johngrandson
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: pull
Source: https://github.com/johngrandson/orkestry/tree/main/.claude/skills/pull
Command: npx skills add https://github.com/johngrandson/orkestry --skill pull-johngrandson

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Keeps feature work aligned with the main line by merging origin/main into the current local branch and guiding conflict resolution to maintain code integrity.

Core Features & Use Cases

  • Safe merge strategy: prefers non-destructive merges and supports deterministic conflict handling.
  • Branch hygiene: ensures rerere is enabled and checks remote/origin state before merging.
  • Use Case: For a feature branch that lags behind origin/main, apply this skill to fetch, merge, and resolve conflicts with clear guidance.

Quick Start

Run the pull command to sync your current branch with the latest origin/main and resolve any conflicts that arise.

Frequently Asked Questions about pull

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I safely merge origin/main into my current git feature branch?▼

To safely merge origin/main into your current git feature branch, the skill fetches updates, validates remotes, and uses a non-destructive merge workflow. It requires rerere to be enabled for deterministic conflict handling.

What is the best way to resolve git merge conflicts during a branch sync?▼

Resolving git merge conflicts during a branch sync is handled through guided resolution practices enforced by the skill. It ensures branch hygiene by checking remote state and supporting deterministic conflict handling.

Why does my git workflow require rerere to be enabled before merging?▼

Your git workflow requires rerere to be enabled to maintain code integrity and support deterministic conflict handling. This prerequisite enforces a safe merge strategy before syncing your feature branch.

How do I automate syncing a feature branch with origin/main?▼

Automating syncing a feature branch with origin/main is achieved by running the pull skill, which fetches updates and merges them into the local branch. It validates your current branch and remote state before applying the merge.

When do I need to merge origin/main into my local branch instead of rebasing?▼

You need to merge origin/main into your local branch when following a non-destructive merge strategy to keep feature work aligned. This approach maintains code integrity while providing guided conflict resolution.

Does this branch synchronization method work without configuring remote repositories?▼

This branch synchronization method does not work without valid remotes, as it explicitly validates remote and origin state before merging. Ensuring correct remote configuration is a required step for the safe merge workflow.

Related Skills

Explore More Software Engineering Skills→
airhornsairhorns

pull

Merge origin/main into the local feature branch and resolve conflicts.

Community
Intermediate
bmsull560bmsull560

jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Community
Intermediate
flurdyflurdy
6

rebase-main

Rebase the current feature branch onto origin/main with conflict handling and status reporting.

Community
Intermediate
dtbuchholzdtbuchholz

sync

Synchronize the current Git branch with origin/main via rebase or pull.

Community
Intermediate