Skip to content

benoror/obsidianos_work / .agents/skills/sync-upstream-obsidianos

sync-upstream-obsidianos

Verified

Pull structural updates from upstream ObsidianOS into the local vault.

FileKindSize
SKILL.mdskill md2.1 KB
---
name: sync-upstream-obsidianos
description: "Pull structural updates from upstream ObsidianOS into the local vault."
license: MIT
---

# Sync Upstream ObsidianOS

Shortcut to run [`.scripts/sync-upstream.sh`](../../../.scripts/sync-upstream.sh).

## Usage

| Command | What it does |
| --- | --- |
| `/sync-upstream-obsidianos` | Preview and merge upstream updates |
| `/sync-upstream-obsidianos preview` | Preview only — show what's new without merging |

## Workflow

### 1. Check prerequisites

- Verify the `obsidianos_work` remote exists: `git remote get-url obsidianos_work`. That is the script's default (`--remote` overrides it). If missing, tell the user to add it and do not create it:
  ```
  git remote add obsidianos_work <url-or-path-to-obsidianos_work>
  ```
  A local checkout works the same as a GitHub URL. The path itself lives in git config, not in this skill.
- Verify working tree is clean (`git status --short`). If dirty, ask the user to commit or stash first.

### 2. Preview

Run `.scripts/sync-upstream.sh --preview` and show the output (new commits and changed files).

If there are no new commits, report "already up to date" and stop.

If the user only asked for `preview`, stop here.

### 3. Confirm and merge

Present the preview results and ask the user to confirm before merging.

On confirmation, run the full sync:

```
echo y | ./.scripts/sync-upstream.sh
```

### 4. Report results

Show the merge outcome:
- Which files were updated.
- Whether any files were excluded via `.sync-exclude`.
- The final commit (`git log -1 --oneline`).

If the merge had conflicts, relay the conflict list and instruct the user to resolve manually.

## Important Notes

- The script protects personal files (Meetings, Teams, Templates, etc.) via `.gitattributes` merge=ours rules.
- Files matching patterns in `.sync-exclude` are auto-removed from the merge (e.g. upstream example files).
- This skill never pushes — the user decides when to push.
- If the `obsidianos_work` remote doesn't exist, do not create it automatically — prompt the user for the URL or local path.
slack-gif-creatoranthropics/skillsKnowledge and utilities for creating animated GIFs optimized for Slack. Provides constraints, validation tools, and animation concepts. Use when users request animated GIFs for Slack like "make me a GIF of X doing Y for Slack."Stars: 198kUpdated Claude CodeCodexVerifiedInstall
ponytailDietrichGebert/ponytailLazy senior dev mode for any coding task: the smallest change that fully solves it, and a reply a busy human understands in one read.Stars: 194kUpdated Claude CodeCodexVerifiedInstall
ponytail-debtDietrichGebert/ponytailHarvest every shortcut: comment into one debt ledger, so deferrals get tracked instead of forgotten. One-shot report.Stars: 194kUpdated Claude CodeCodexVerifiedInstall
ponytail-debtDietrichGebert/ponytailList every `shortcut:` comment (and older `ponytail:` ones) as a debt ledger. One-shot report, changes nothing. Use for "ponytail debt", "what did ponytail defer", "list the shortcuts", /ponytail-debt.Stars: 194kUpdated Claude CodeCodexVerifiedInstall