Git Upstream Rebase

Rebase a local branch onto upstream/main and handle conflicts safely. Use when user says "upstream 更新了", "git pull --rebase upstream main", "rebase upstream/main", "同步上游 main", "处理 rebase 冲突", or wants to update a fork from upstream with automatic conflict resolution.

openghz Updated

File contents

openghz/agentskills commit d3fb3b35ec

Frequently asked questions

npx get-skill add openghz/git-upstream-rebase