skills.rest
luigiinred
luigiinredCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

resolve-main-conflicts

Resolve Git merge or rebase conflicts when syncing a branch with main.

1|Updated Feb 18, 2026
Search Tags:#git#developer tools#version control#merge conflict#rebase#branch sync
One-click install
npx skills add https://github.com/luigiinred/dotfiles --skill resolve-main-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-main-conflicts
Source: https://github.com/luigiinred/dotfiles/tree/main/dot_cursor/skills/resolve-main-conflicts
Command: npx skills add https://github.com/luigiinred/dotfiles --skill resolve-main-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you synchronize your current branch with the main branch of a Git repository, automatically handling and resolving any merge or rebase conflicts that arise.

Core Features & Use Cases

  • Conflict Resolution: Guides you through resolving merge/rebase conflicts by identifying conflicted files and providing steps to edit them.
  • Branch Synchronization: Fetches the latest changes from origin/main and integrates them into your current branch.
  • Workflow Options: Supports both merge and rebase strategies, defaulting to merge for safety.
  • Use Case: When working on a feature branch, you need to incorporate the latest updates from main before merging your feature. This skill ensures a clean integration.

Quick Start

Sync your current branch with origin/main and resolve any conflicts.

Frequently Asked Questions about resolve-main-conflicts

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

FAQPage Schema
How do I resolve git merge conflicts when syncing my branch with main?▼

To resolve git merge conflicts, fetch the latest changes from origin/main, merge or rebase them into your current branch, identify conflicted files, and edit them to resolve the conflict markers before committing.

What is the best way to sync a local feature branch with the main branch?▼

The best way to sync a local branch is to fetch updates from origin/main and integrate them using a merge or rebase. This skill guides you through both strategies, defaulting to merge for safety to ensure clean integration.

How do I handle uncommitted changes before rebasing a branch?▼

Handle uncommitted changes before rebasing by stashing them. This skill safely stashes your working directory changes, performs the branch synchronization, and restores your work afterward to prevent data loss.

Can I use a rebase strategy instead of a merge to update my branch?▼

Yes, you can use a rebase strategy. This skill supports both merge and rebase workflows for branch synchronization, allowing you to choose your preferred method while providing guided conflict resolution.

What safety precautions are enforced during git conflict resolution?▼

Safety precautions during conflict resolution include preventing force pushes and avoiding premature aborts. The skill also manages uncommitted changes via stashing to protect your local work throughout the synchronization process.

Why do I need to fetch from origin/main before resolving conflicts?▼

Fetching from origin/main is required to retrieve the latest remote updates before integrating them into your local branch. This ensures your conflict resolution process is based on the most current repository state.

Related Skills

Explore More Software Engineering Skills→
ReidondReidond

branch-switch

Switch Git branches while preserving uncommitted changes via stashes.

Community
Advanced
Cnext-euCnext-eu
1

SC-merge-pr

Merges a feature branch into main via automated gh CLI pull request.

Official
Intermediate
yash-gargyash-garg

resolving-merge-conflicts

Resolve in-progress git merge and rebase conflicts by analyzing changes and completing integration workflows.

Community
Intermediate
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced