name	jksync
description	Sync the current branch with the repo's primary branch (main, master, preprod, etc). Pulls primary, switches back, merges in, pushes.

Detect the repo's primary branch: check git remote show origin for HEAD, then fall back to looking for main/master/preprod/develop in that order.

Steps:

Record the current branch name
If there are uncommitted changes, git stash
git switch <primary> and git pull
git switch <original-branch>
git pull (if an upstream is set for this branch)
git merge <primary> — or git rebase <primary> if the branch's existing commits are already pushed and rebase is clearly wrong; default to merge
git push
If stashed, git stash pop

If there are merge conflicts, stop immediately and describe which files conflict and what the conflict looks like. Do not attempt to resolve conflicts automatically.

Report what you did when finished: primary branch name detected, whether a stash was needed, final push status.

name	jksync
description	Sync the current branch with the repo's primary branch (main, master, preprod, etc). Pulls primary, switches back, merges in, pushes.

Detect the repo's primary branch: check git remote show origin for HEAD, then fall back to looking for main/master/preprod/develop in that order.

Steps:

Record the current branch name
If there are uncommitted changes, git stash
git switch <primary> and git pull
git switch <original-branch>
git pull (if an upstream is set for this branch)
git merge <primary> — or git rebase <primary> if the branch's existing commits are already pushed and rebase is clearly wrong; default to merge
git push
If stashed, git stash pop

If there are merge conflicts, stop immediately and describe which files conflict and what the conflict looks like. Do not attempt to resolve conflicts automatically.

Report what you did when finished: primary branch name detected, whether a stash was needed, final push status.

jksync

安装方式

检查来源文件

jksync

来源信息

安装方式

检查来源文件

同仓库更多 Skills

同仓库更多 Skills