skills.rest
ReinaMacCredy
ReinaMacCredyCOMMUNITY
Explore all skills by this author →
Website𝕏@ReinaMacCredyGitHub

pull

Merge origin/main into a local Git branch with guided conflict resolution.

Updated Mar 13, 2026
Search Tags:#git#developer tools#merge#conflict resolution#codebase update#branch sync
One-click install
npx skills add https://github.com/ReinaMacCredy/Maestro-CLI --skill pull-reinamaccredy
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: pull
Source: https://github.com/ReinaMacCredy/Maestro-CLI/tree/main/.codex/skills/maestro%3Asymphony-setup/reference/codex-skills/pull
Command: npx skills add https://github.com/ReinaMacCredy/Maestro-CLI --skill pull-reinamaccredy

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill automates the process of updating your local feature branch with the latest changes from the origin/main branch, including the resolution of merge conflicts.

Core Features & Use Cases

  • Merge Conflict Resolution: Provides detailed guidance on how to effectively resolve merge conflicts using Git's built-in tools and best practices.
  • Branch Synchronization: Ensures your local branch is up-to-date with remote changes before continuing development.
  • Use Case: When working on a feature branch, you need to incorporate the latest updates from the main development line without disrupting your ongoing work. This skill helps you merge origin/main into your branch and handle any conflicts that arise.

Quick Start

Update your current branch by merging the latest changes from origin/main and resolving any conflicts.

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 Git branch with origin/main?▼

Merge conflicts occur when your local feature branch and origin/main modify the same code segments. This Skill guides you through resolving these conflicts using Git CLI built-in tools and best practices to maintain code integrity.

What is the best way to update a feature branch with remote changes?▼

Yes, you need the Git CLI installed and configured. The Skill requires adherence to merge conflict best practices and relies on Git's built-in tools to ensure code integrity during the branch synchronization process.

Why does merging origin/main into my branch create conflicts?▼

Merging origin/main creates conflicts when overlapping edits exist between your local branch and the remote main line. The Skill provides detailed guidance to resolve these conflicts effectively and maintain codebase stability.

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

You need to merge origin/main into your local branch when you must incorporate the latest updates from the main development line. This ensures your feature branch remains synchronized with the remote codebase before continuing development.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
Soul-Brews-StudioSoul-Brews-Studio
116

merged

Switch to main, pull latest changes, and delete merged branches.

Official
Basic
jamescjamesc

resolve-merge

Merge origin/main into the current branch and resolve conflicts.

Community
Advanced
JacobPEvansJacobPEvans
3

rebase-pr

Rebase pull requests onto main with signed commits and GitHub API checks.

Community
Advanced