The pages still told users to inspect conflicts with git status and to fix diverged tracked repos with git pull --rebase, but pull now merges diverged history, resolves .metadata.json conflicts on its own, and undoes the merge on any other conflict, so those steps no longer match what happens. Also documents the Git Sync page fetch, the Pull count, and the push_rejected API error in every translated locale.
3.5 KiB
sidebar_position
| sidebar_position |
|---|
| 1 |
push
Commit and push source to git remote.
Use commit instead when you only want a local checkpoint without pushing.
skillshare push # Auto-generated message
skillshare push -m "Add pdf" # Custom message
skillshare push --dry-run # Preview
When to Use
- Share skill changes with your other machines via git
- Back up your skills to a remote repository
- After editing skills, commit and push in one command
If you want to save a local checkpoint without sharing it yet, use skillshare commit.
What Happens
flowchart TD
CMD["skillshare push"]
CHECK["1. Check repository status"]
STAGE["2. Stage all changes"]
COMMIT["3. Commit"]
PUSH["4. Push to remote"]
CMD --> CHECK --> STAGE --> COMMIT --> PUSH
Options
| Flag | Description |
|---|---|
-m, --message <msg> |
Commit message (default: "Update skills") |
--dry-run, -n |
Preview without making changes |
Git Root Scope
push operates on the directory selected by the git_root config field (default: skills source). See commit — Git Root Scope for the scope table. If git_root was changed but the git repo still lives in another scope's directory, push prints a "Git root mismatch" error with the exact git init / mv commands to fix it. See Changing the scope after init.
Prerequisites
Your source directory must be a git repository with a remote:
# Set up during init (recommended):
skillshare init --remote git@github.com:you/my-skills.git
# Or add remote to existing setup:
skillshare init --remote git@github.com:you/my-skills.git
Init automatically creates the initial commit, so push works immediately after setup.
First Push Upstream Mapping
On first push (no upstream tracking yet), skillshare push auto-configures upstream:
- If remote already has a default branch (for example
mainortrunk), local changes are pushed to that remote default branch. - If remote is empty, it pushes to your current local branch.
This avoids accidentally creating the wrong remote branch (for example local master while remote uses main).
Examples
# Quick push with auto message
skillshare push
# Custom commit message
skillshare push -m "Add commit-commands skill"
# Preview what would be pushed
skillshare push --dry-run
Conflict Handling
If the remote has newer commits:
$ skillshare push
Push failed
Remote may have newer changes
Run: skillshare pull
Then: skillshare push
Solution:
skillshare pull # Merge remote changes with yours
skillshare push # Push your changes
pull merges the remote commits with the ones you have not pushed yet, so the second push goes through. See When Both Machines Committed for what happens if both sides changed the same file.
Workflow
Typical workflow for sharing skills:
# 1. Make changes to skills
# 2. Push to remote
skillshare push -m "Update my-skill"
# On another machine:
skillshare pull # Gets changes and syncs
See Also
- commit — Commit locally without pushing
- pull — Pull from remote
- sync — Sync to local targets
- Cross-Machine Sync — Full setup