Fetch origin/main, merge it into the current branch, resolve conflicts, run tests, and push.
npx skills add https://github.com/usesofia/agents-toolkit --skill git-merge-usesofia
Please help me install this Agent Skill. Skill: git-merge Source: https://github.com/usesofia/agents-toolkit/tree/main/skills/git-merge Command: npx skills add https://github.com/usesofia/agents-toolkit --skill git-merge-usesofia
Merge latest changes from upstream main into your current feature branch to keep work up to date and reduce integration risk.
Switch to your feature branch, fetch origin, merge origin/main, resolve conflicts, test, and push.
High-intent search queries and answers about installing and using this skill.
Merging upstream main involves fetching the remote, merging origin/main into your current branch, resolving conflicts, and running tests. This guided workflow keeps your feature branch aligned with main.
You need to sync during feature development and release preparation to incorporate the latest changes. Keeping your branch up to date reduces integration risk and ensures alignment with main.
The workflow includes conflict resolution steps to handle merge issues. It performs quick checks and safeguards against missing upstream before pushing the updated branch.
Yes, the workflow runs tests before pushing. After fetching, merging, and resolving conflicts, it performs test verification to ensure the updated branch is stable.
The workflow includes safeguards for missing upstream and merge issues. It fetches origin, merges main, resolves conflicts, runs tests, and only pushes if these checks pass.
mvillmowSyncs Git worktrees by fetching remote and rebasing or merging main into feature branches.
dobrinz123Push branches, create pull requests, and monitor merge status.
hachejResolve git merge and rebase conflicts by analyzing commit history and code intent.
jkomorosRebase a feature branch onto main and merge via pull request.
