agentleFS
Sign inStart free
laz3rjenkinslaz3rjenkins/atomic-commits/skills/sync/SKILL.md

sync

Skill0 starsChanged 52 days agoMITView on GitHub

Pull the latest remote changes into the current branch with a rebase, and help resolve conflicts. Never pushes.

54 other projects use a version of this.

Adopted by

Most recently taken up by

Used with

Projects with it also use develop, scope and 10 more.

Other files people use alongside this one.

Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
  • hong9LeeSkill

    develop

    빌드, 아키텍처, git 관련 작업 시 OMS MSA 공통 인프라 규칙을 적용한다. 기술 스택, 빌드 명령, 헥사고날 아키텍처 구조, git 워크플로우, AI Context 동기화 규칙을 다룬다. 코드 작성 컨벤션은 /convention, 테스트 컨벤션은 /test-guide 스킬을 참조.

    Also in 6 projects that use this

  • YuriNachosSkill

    scope

    Configure claude-scope status line widgets for Claude Code. Use when user wants to customize widgets, change theme, reorder elements, or modify display style.

    Also in 7 projects that use this

  • nicolasestremSkill

    document

    Create focused documentation for specific components or features

    Also in 5 projects that use this

  • kt057Skill

    check

    lint, typecheck, test を一括実行して結果をサマリーする

    Also in 6 projects that use this

  • Microsoft AzureSkill

    test

    Also in 8 projects that use this

  • Microsoft AzureSkill

    validate

    Run the full CI validation workflow locally before submitting a PR. Use this as a final check to ensure all Azure DevOps CI pipeline steps will pass.

    Also in 4 projects that use this

The file

We split this skill into the rules it gives an agent

6 rules. 0 are common, 4 are distinctive, and 2 are very specific to this project.

  • 0

    Common

    Most of the 47 edited versions we read keep these.

  • 4

    Distinctive

    This author's own choices. Worth a look.

  • 2

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Very specific:

    Check the branch: If it has no upstream (git rev-parse --abbrev-ref @{u} fails), there's nothing to sync from.

    line 12
  2. Distinctive:

    Read both sides and work out what each one was trying to do.

    line 17
  3. Very specific:

    If the intent is clear (independent edits, or one side is clearly a newer version of the other), resolve the conflict, git add the file, …

    line 18
  4. Distinctive:

    If the two sides changed the same logic in incompatible ways, show both versions to the user and ask.

    line 19
  5. Distinctive:

    If the user wants to back out, git rebase --abort restores the state from before the sync.

    line 20
  6. Distinctive:

    Autostash conflicts: If the stash doesn't apply cleanly after the rebase, it is kept in git stash list.

    line 22

“Common” is measured: kept by at least 6 in 10 of the 47 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Sync with the remote

Rebase keeps history linear and avoids noise commits like "Merge branch 'main' of ...". Your local commits are replayed on top of the remote ones.

  1. Check the branch. If it has no upstream (git rev-parse --abbrev-ref @{u} fails), there's nothing to sync from. Say so, and suggest /push to publish the branch.
  2. Pull: git pull --rebase --autostash. --autostash sets uncommitted changes aside and restores them afterwards, so a dirty working tree is fine.
  3. Conflicts. For each conflicted file (git diff --name-only --diff-filter=U):
    • Read both sides and work out what each one was trying to do.
    • If the intent is clear (independent edits, or one side is clearly a newer version of the other), resolve the conflict, git add the file, and continue with GIT_EDITOR=true git rebase --continue.
    • If the two sides changed the same logic in incompatible ways, show both versions to the user and ask. Don't guess. A wrong guess here silently loses someone's work.
    • If the user wants to back out, git rebase --abort restores the state from before the sync.
  4. Autostash conflicts. If the stash doesn't apply cleanly after the rebase, it is kept in git stash list. Tell the user.
  5. Report how many commits came from the remote (short summary), how many local commits were replayed, and any conflicts you resolved and how. Don't push; /push is the next step when the user wants it.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free