git-sync-upstream SKILL.md skillA

git-sync-upstream from nicholyx/ai-skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.

mdr add nicholyx/ai-skills/git-sync-upstream@git:20260928.d37ee90

Pins git:20260928.d37ee90 in mdr.lock. Pin the fingerprint instead.

Audit grade

A, 17 of 17 checks passed

Kind

SKILL.md skill

Repository

nicholyx/ai-skills

Path

custom/daily/git-sync-upstream/SKILL.md

Versions recorded

3

Latest version

git:20260928.d37ee90, committed Sep 28, 2026

First version recorded

May 16, 2026

Size

3,490 bytes

Repository stars

6

License

Apache-2.0

Fork 仓库同步 upstream 最新代码到当前分支，使用 rebase 方式保持提交历史整洁。当用户说"同步upstream"、"rebase upstream"、"更新upstream main"、"拉取upstream更新"、"同步上游仓库"、"fork仓库更新"、"更新PR分支"时触发。自动处理未提交更改（stash/rebase/pop）、fetch upstream、rebase 到最新、强制推送更新 PR。专门用于 fork 仓库同步上游更新的场景，不适用于普通的 git pull 操作。.

Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.

What the file says

# Git Sync Upstream

将当前分支 rebase 到 upstream/main 的最新代码，适用于 fork 仓库同步上游更新的场景。

## 前置检查

执行任何操作前，先检查：

```bash
# 1. 确认 remote 配置
git remote -v

# 2. 确认当前分支
git branch --show-current

# 3. 检查是否有 upstream remote
git remote | grep -q upstream || echo "需要先添加 upstream remote"
```

如果用户没有配置 upstream remote，询问用户上游仓库地址。

## 工作流程

### Step 1: 获取上游最新代码

```bash
git fetch upstream
```

### Step 2: 查看更新情况

```bash
# 你的提交
git log upstream/main..HEAD --oneline

# 上游更新
git log HEAD..upstream/main --oneline
```

**快速退出判断**：
- 如果上游没有新提交（`HEAD..upstream/main` 为空），直接告知用户：

> ✅ 当前分支已是最新，无需同步。上游没有新的更新。

然后询问用户是否需要处理当前工作区的更改（如果有），直接结束流程。

- 如果上游有更新，继续执行后续步骤。

### Step 3: 处理未提交的更改

检查是否有未提交的更改：

```bash
git status
```

**如果有未提交的更改**，询问用户选择：
1. **Stash 后 rebase**（推荐）- 暂存更改，rebase 完成后恢复
2. **先提交再 rebase** - 提交这些更改后 rebase
3. **放弃更改** - 丢弃这些更改

### Step 4: 执行 Rebase

```bash
# 如果用户选择 stash
git stash push -m "temporary stash before rebase"

# 执行 rebase
git rebase upstream/main
```

如果 rebase 过程中发生冲突：
- 列出冲突文件
- 指导用户解决冲突
- 解决后执行 `git rebase --continue`

### Step 5: 恢复暂存的更改

如果之前 stash 了更改：

```bash
git stash pop
```

### Step 6: 推送更新

Rebase 成功后，需要强制推送（因为改写了历史）：

```bash
# 先展示 rebase 后的 commit 历史
…

Read the whole file at its exact version.

How to install

mdr add nicholyx/ai-skills/git-sync-upstream@sha256:0faf795df9a90730

[![mdr](https://markdownregistry.com/badge/art_27zx4g2zdrukfe63.svg)](https://markdownregistry.com/a/art_27zx4g2zdrukfe63)

Versions

The registry has recorded 3 versions of this file, between May 16, 2026 and Sep 28, 2026, about one every 68 days.

Audit of the latest version

Source

API

GET https://markdownregistry.com/api/v1/artifacts/art_27zx4g2zdrukfe63
GET https://markdownregistry.com/api/v1/resolve?ref=nicholyx/ai-skills/git-sync-upstream
GET https://markdownregistry.com/api/v1/blob/0faf795df9a907303dd48569685c097d0f0e7753a4cc6e34a2d3fedc2cdc536f

Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.

Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.

More from nicholyx/ai-skills

Every file in nicholyx/ai-skills

Browse by kind, by grade A, or by owner.