git-merge

Name: git-merge
Availability: InStock
Author: Sofia

Fetch origin/main, merge it into the current branch, resolve conflicts, run tests, and push.

Updated Aug 23, 2026

Search Tags:#git #workflow #development #merge #branch #conflicts #upstream

Ready to run

npx skills add https://github.com/usesofia/agents-toolkit --skill git-merge-usesofia

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-merge
Source: https://github.com/usesofia/agents-toolkit/tree/main/skills/git-merge
Command: npx skills add https://github.com/usesofia/agents-toolkit --skill git-merge-usesofia

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Merge latest changes from upstream main into your current feature branch to keep work up to date and reduce integration risk.

Core Features & Use Cases

Fetch the latest changes from the remote
Merge origin/main into the current branch
Resolve conflicts and perform quick checks before pushing
Use during feature development and release preparation to stay aligned with main

Quick Start

Switch to your feature branch, fetch origin, merge origin/main, resolve conflicts, test, and push.

Frequently Asked Questions about git-merge

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

FAQPage Schema

How do I merge upstream main into my feature branch?▼

Merging upstream main involves fetching the remote, merging origin/main into your current branch, resolving conflicts, and running tests. This guided workflow keeps your feature branch aligned with main.

When do I need to sync my feature branch with origin/main?▼

You need to sync during feature development and release preparation to incorporate the latest changes. Keeping your branch up to date reduces integration risk and ensures alignment with main.

What happens if there are merge conflicts when syncing with upstream main?▼

The workflow includes conflict resolution steps to handle merge issues. It performs quick checks and safeguards against missing upstream before pushing the updated branch.

Does this git merge workflow run tests before pushing?▼

Yes, the workflow runs tests before pushing. After fetching, merging, and resolving conflicts, it performs test verification to ensure the updated branch is stable.

What safeguards are in place for missing upstream or merge issues?▼

The workflow includes safeguards for missing upstream and merge issues. It fetches origin, merges main, resolves conflicts, runs tests, and only pushes if these checks pass.