New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Git Upstream Sync

by wado-lang in wado-lang/wado

The only way to merge origin/main into a branch, conflicts or not.

MITAuto-check passedDevelopment

Install Git Upstream Sync

skills CLI
$ npx skills add wado-lang/wado --skill git-upstream-sync -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install wado-lang/wado git-upstream-sync --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/wado-lang/wado.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.claude/skills/git-upstream-sync .claude/skills/git-upstream-sync && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
git-upstream-sync
GitHub stars
117
Token cost
~855 tokens
SKILL.md length
378 words
Files
1
Skills in repo
15
Repo updated
First seen
Licence
MIT

At a glance

The only way to merge origin/main into a branch, conflicts or not.

  • Works in 4 steps: Fetch and merge with zdiff3 → If conflicts exist, commit them as-is → Resolve conflicts → …
  • Tasks that involve Git workflow
  • SKILL.md covers Procedure, Important and Generated files
  • Calls git and mise

What it does

Git Upstream Sync is an agent skill from wado-lang/wado. The only way to merge origin/main into a branch, conflicts or not. Use it every time main comes in — a PR reported conflicting or DIRTY, a branch behind origin/main, a CI failure to reproduce on the merged tree. Never run git merge origin/main or git pull origin main by hand.

Its SKILL.md is about 860 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow and Failing and flaky tests. It works with Git and WebAssembly. The repository describes itself as: The Wado Programming Language. The licence is MIT.

When your agent uses it

  • Tasks that involve Git workflow
  • Tasks that involve Failing and flaky tests

Example prompts

  • “/git-upstream-sync”

Workflow steps

4 steps, taken from the step headings in SKILL.md.

  1. Fetch and merge with zdiff3
  2. If conflicts exist, commit them as-is
  3. Resolve conflicts
  4. Run mise run test for sanity check

What it can do on your machine

Read from SKILL.md and the folder at commit 037dba4. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • mise

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Git Upstream Sync loads about 855 tokens when it runs. Until then it costs about 75 tokens; SKILL.md has 378 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~75
When it runs · the whole SKILL.md, loaded when a task matches
~855

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from wado-lang/wado at commit 037dba4, republished under its MIT licence (© wado-lang). 378 words, ~855 tokens.

Download SKILL.mdSave it as .claude/skills/git-upstream-sync/SKILL.md (or your agent's skills folder).
name
git-upstream-sync
description
The only way to merge origin/main into a branch, conflicts or not. Use it every time main comes in — a PR reported conflicting or DIRTY, a branch behind origin/main, a CI failure to reproduce on the merged tree. Never run `git merge origin/main` or `git pull origin main` by hand.

Overview

Merge origin/main into the current branch. Follow every step whether or not the merge conflicts: a clean merge still ends with the sanity check.

Procedure

1. Fetch and merge with zdiff3

If the branch is on origin, pull it first: CI's tidy job may have pushed chore: tidy onto it. If that pull conflicts, take it through steps 2 and 3, then start again here, so origin/main is merged too. Then move the checked-out submodules to the pointers the merge recorded, so the next git add -A does not stage a stale checkout.

sh
b=$(git branch --show-current)
if git ls-remote --exit-code --heads origin "$b" > /dev/null; then
  git pull --no-rebase origin "$b" || exit 1   # a conflict stops here
fi
git fetch origin main
git -c merge.conflictstyle=zdiff3 merge origin/main
git submodule update --recommend-shallow
2. If conflicts exist, commit them as-is

If the merge produces conflicts, commit the conflict markers without resolving them first. This records the raw conflict state in a dedicated commit, separate from the resolution.

sh
git add -A
git diff --cached origin/main -- vendor
git commit -m "merge origin/main (conflicts unresolved)"

The vendor diff prints nothing unless the branch bumps a submodule itself. Anything else is a stale checkout that git add -A staged, reverting main's bump. Restore main's pointer for each such path before committing, and check again after every git add -A, step 3's included:

sh
git update-index --cacheinfo 160000,"$(git rev-parse origin/main:vendor/wasmtime)",vendor/wasmtime
3. Resolve conflicts

After committing the unresolved state:

  1. Read each conflicted file and understand both sides of the conflict
  2. Resolve conflicts in code files (remove conflict markers, choose correct code)
  3. For generated files (golden fixtures, generated parsers, …) that conflict, regenerate them by re-running their generator and commit the fresh output — do not hand-resolve the markers or defer them (see "Generated files" below)
  4. Stage and commit the resolution:
sh
git add -A
git diff --cached origin/main -- vendor   # as in step 2
git commit -m "resolve merge conflicts"
Show full SKILL.md (133 more words)Show less
4. Run mise run test for sanity check

CI applies clippy and format, so a quick sanity check is sufficient.

Important

  • Always use -c merge.conflictstyle=zdiff3 so the merge base is visible in conflict markers (with zealous zdiff3 reducing noise)
  • Always commit the unresolved conflicts first, then resolve in a separate commit — this preserves a clear record of what the conflicts looked like vs how they were resolved
  • Do NOT squash the two commits together

Generated files

  • Always regenerate golden / generated files and commit. Re-run the generator (do not hand-resolve the markers) and commit its output. Do not skip them or defer them to on-task-done / CI.
  • Never silently discard generated output (e.g. git restore to clean the tree or quiet a hook). Commit it, or ask. Discarding generated work without asking is always wrong.

© wado-lang, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .claude/skills/git-upstream-sync of wado-lang/wado.

Open the folder on GitHubat commit 037dba4

Compare with similar skills

Git Upstream Sync next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Git Upstream Sync compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Upstream Sync this skillwado-lang/wado117—~855Automated safety check: PassMIT
SkillhoneTencent/SkillHone1681 repos~3.4kAutomated safety check: PassCustom licence
Streamlit Rebasewhitphx/stlite1.7k—~2.3kAutomated safety check: PassApache-2.0
Make Git Escrowinternet-court/internet-court-skill6.4k2 repos~922Automated safety check: NotesMIT
Bisect Aware InstrumentationArabelaTso/Skills-4-SE253—~2kAutomated safety check: PassApache-2.0
Flowfile Failure ArchaeologyEdwardvaneechoud/Flowfile373—~7.5kAutomated safety check: PassMIT

Similar skills

  • Skillhone

    Tencent/SkillHone

    Local Issue, pull-request, and Wiki workbench for agent skills.

    168 GitHub starsUsed in 1 repo~3.4k tokens
    DevelopmentAuto-check passed

  • Streamlit Rebase

    whitphx/stlite

    Rebase our custom fork of the Streamlit repository onto new upstream Streamlit release

    1.7k GitHub stars~2.3k tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Make Git Escrow

    internet-court/internet-court-skill

    Create a new git escrow bounty for a test suite. An agent skill from internet-court/internet-court-skill.

    6.4k GitHub starsUsed in 2 repos~922 tokens
    Testing & QAAuto-check: notes

  • Bisect Aware Instrumentation

    ArabelaTso/Skills-4-SE

    Instrument code to support efficient git bisect by producing deterministic pass/fail signals and concise runtime summaries for each tested commit.

    253 GitHub stars~2k tokensUpdated 1 mo ago
    Testing & QAAuto-check passed

  • Flowfile Failure Archaeology

    Edwardvaneechoud/Flowfile

    Chronicles 25+ major incidents in Flowfile's git history (worker/kernel deadlocks and races, reverted or self-reverted branches, Electron/Tauri packaging breakage, codegen correctness bugs, CI…

    373 GitHub stars~7.5k tokensUpdated today
    DevelopmentAuto-check passed

  • Git Bisect Assistant

    ArabelaTso/Skills-4-SE

    Automatically performs git bisect to identify the first bad commit that introduced a bug or failure.

    253 GitHub stars~1.2k tokensUpdated 1 mo ago
    Testing & QAAuto-check passed

More from wado-lang/wado

All 15 skills in this repo

  • Profiling Wado Compiler

    wado-lang/wado

    Profile the native Rust wado binary (compile/serve/run) for host-side bottlenecks — CPU with a sampling profiler, memory with the span trace's RSS and valgrind DHAT.

    117 GitHub stars~2.9k tokensUpdated today
    Auto-check: notes

  • Wado Performance

    wado-lang/wado

    Analyze and improve the runtime speed of a Wado program's compiled guest Wasm — profile hot functions, read the generated WIR for allocations and copies, reason about the WasmGC cost model, and…

    117 GitHub stars~7.5k tokensUpdated today
    Auto-check passed

  • CI Timing

    wado-lang/wado

    Measure how long GitHub Actions jobs and steps took across past runs, and find the pull request that made CI slower.

    117 GitHub stars~518 tokensUpdated today
    Auto-check passed

  • Coverage Investigation

    wado-lang/wado

    Investigate and improve code coverage for the wado-compiler crate.

    117 GitHub stars~1.1k tokensUpdated today
    Auto-check passed

  • Jco

    wado-lang/wado

    Transpile Wado Wasm components to JS with jco, then run, debug, and benchmark them on Node.

    117 GitHub stars~2.7k tokensUpdated today
    Auto-check passed

  • On Task Done

    wado-lang/wado

    Task-completion flow: /cr (a /code-review answered with /code-review-response, which ends with /distill), update docs (spec/cheatsheet/compiler/optimizer), then run mise run on-task-done (build…

    117 GitHub stars~611 tokensUpdated today
    Auto-check passed

Works with

Categories

Questions about Git Upstream Sync

What does Git Upstream Sync do?

The only way to merge origin/main into a branch, conflicts or not. Git Upstream Sync is an agent skill from wado-lang/wado. The only way to merge origin/main into a branch, conflicts or not.

When should I use Git Upstream Sync?

Git Upstream Sync fits situations like: tasks that involve Git workflow; tasks that involve Failing and flaky tests.

How do I install Git Upstream Sync in Claude Code?

Run `npx skills add wado-lang/wado --skill git-upstream-sync -a claude-code`. Or copy the skill folder (.claude/skills/git-upstream-sync in wado-lang/wado) into .claude/skills/git-upstream-sync in your project. Claude Code loads it when a task matches its description.

How do I install Git Upstream Sync in Codex?

Run `npx skills add wado-lang/wado --skill git-upstream-sync -a codex`. Or copy the skill folder (.claude/skills/git-upstream-sync in wado-lang/wado) into .agents/skills/git-upstream-sync in your project. Codex loads it when a task matches its description.

Can I use Git Upstream Sync in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add wado-lang/wado --skill git-upstream-sync -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-upstream-sync, .gemini/skills/git-upstream-sync, .github/skills/git-upstream-sync and .opencode/skills/git-upstream-sync in your project.

What does Git Upstream Sync need to run?

Going by SKILL.md and its folder, Git Upstream Sync needs the command-line tools its instructions call (git and mise).

Does Git Upstream Sync access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Git Upstream Sync safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Git Upstream Sync use?

Git Upstream Sync is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Upstream Sync use?

About 855 tokens (SKILL.md is roughly 3.4k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Git Upstream Sync?

Skills that share tags, products or a category with Git Upstream Sync: Skillhone (Tencent/SkillHone, 168 stars), Streamlit Rebase (whitphx/stlite, 1.7k stars), Make Git Escrow (internet-court/internet-court-skill, 6.4k stars) and Bisect Aware Instrumentation (ArabelaTso/Skills-4-SE, 253 stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Upstream Sync?

wado-lang (a GitHub organization) maintains it in wado-lang/wado, which has 117 GitHub stars. The repository holds 15 skills in this directory. The repository was last updated on October 8, 2026.

Source: wado-lang/wado on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.