skills.rest
airhorns
airhornsCOMMUNITY
Explore all skills by this author →
Website𝕏@harrybrundageGitHub

pull

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

Updated Mar 22, 2026
Search Tags:#git#workflow#merge#branch#pull#conflict-resolution#conflicts
One-click install
npx skills add https://github.com/airhorns/jam --skill pull-airhorns
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: pull
Source: https://github.com/airhorns/jam/tree/main/.agents/skills/pull
Command: npx skills add https://github.com/airhorns/jam --skill pull-airhorns

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Pull latest origin/main into the current local branch and resolve merge conflicts (aka update-branch). Use when Codex needs to sync a feature branch with origin, perform a merge-based update (not rebase), and guide conflict resolution best practices.

Core Features & Use Cases

  • Safe, merge-based updates to keep feature branches in sync with origin/main.
  • Step-by-step conflict resolution guidance to minimize disruption.
  • Best practices for preserving a clean history during updates from origin.

Quick Start

Pull the latest origin/main into your current branch and resolve any conflicts using the outlined workflow.

Frequently Asked Questions about pull

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

FAQPage Schema
How do I sync a local feature branch with origin/main using a merge?▼

To safely resolve Git merge conflicts during a pull, follow step-by-step conflict resolution guidance that includes enabling rerere for recorded resolutions. This minimizes disruption and preserves a clean history while syncing your feature branch.

What is the best way to keep my feature branch updated with origin/main?▼

Yes, you can use a merge-based update workflow instead of rebasing to sync your feature branch. This approach fetches origin/main and merges it into your current branch, applying conflict resolution best practices to maintain a clean history without rewriting commits.

When do I need to perform a merge-based update for my Git branch?▼

Git merge conflict resolution during a pull uses rerere enablement to record and automatically reapply previous conflict fixes. This mechanism, combined with pre-merge checks and post-merge validation, ensures safe conflict handling and minimizes manual disruption.

Does this Git workflow support conflict resolution without rebasing?▼

Before pulling origin/main into your local branch, ensure you have a clean working directory and are on the correct feature branch. The workflow performs pre-merge checks to verify your environment is ready for a safe merge and conflict resolution.

Related Skills

Explore More Software Engineering Skills→
kirvinkirvin

sync

Fetch upstream changes and rebase the current Git branch onto them.

Community
Intermediate
glhewettglhewett

git-merge-into

Merge feature branches into a target branch and push it to remote.

Community
Intermediate
BURHANDEV-ENTERPRISEBURHANDEV-ENTERPRISE

autosycn

Automate Git commit, push, and branch merging with verified user identity.

Official
Advanced
gewoonsebagewoonseba
9

rebase-main

Rebase the current branch onto origin/main after conflict resolution.

Community
Advanced