Skills
.Work. You
Rest

Update from Main

Community

Sync and rebase your branch from origin/main.

Software Engineering#git#sync#rebase#branch#conflicts#origin/main
Authorzmchenry
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps developers keep their feature branches up-to-date with the latest changes from origin/main by performing a git rebase, reducing conflicts and drift between local work and the main branch.

Core Features & Use Cases

  • Rebase onto origin/main: Integrates upstream changes into the current branch without creating merge commits.
  • Conflict guidance: Detects conflicts and guides the user through resolution or aborts if needed.
  • Safe workflow: Verifies a clean working tree, fetches origin, and presents clear next steps for completion.

Quick Start

Check the current branch name Ensure the working directory is clean (no uncommitted changes) Fetch latest changes from origin Rebase current branch onto origin/main If conflicts occur, resolve them or abort and retry

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: Update from Main
Download link: https://github.com/zmchenry/dotfiles/archive/main.zip#update-from-main

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.