Merge a topic branch into the base branch and resolve conflicts in the main worktree.
npx skills add https://github.com/Tyrizx/Tyrizx --skill merge-tyrizx
Please help me install this Agent Skill. Skill: merge Source: https://github.com/Tyrizx/Tyrizx/tree/main/src/vs/sessions/skills/merge Command: npx skills add https://github.com/Tyrizx/Tyrizx --skill merge-tyrizx
High-intent search queries and answers about installing and using this skill.
Run git merge <topic-branch> from the main worktree, or use git -C <main-worktree-path> merge <topic-branch> to merge without leaving your current worktree. Commit any uncommitted changes first to avoid merge failures.
List conflicted files with git diff --name-only --diff-filter=U, then edit each file to preserve the intent of both sides and stage it with git add. Once all conflicts are staged, run git commit --no-edit to complete the merge.
Yes, use git -C <path> followed by the command to operate on a different worktree. This lets you merge, check status, or stage files in the main worktree while staying in your current session worktree.
Run git merge --abort to cancel the in-progress merge and restore the branch to its pre-merge state. This is useful when conflict resolution is unclear and you want to ask for guidance before proceeding.
Check that the worktree is clean with git status --porcelain, then confirm the topic branch is fully merged using git merge-base --is-ancestor <topic-branch> HEAD. A zero exit code means all commits are merged.
posit-devMerges a topic branch into the base branch across git worktrees with conflict resolution.
thiansitSwitch to main, pull updates, and delete a merged Git feature branch.
cogine-aiResolve git merge conflicts non-interactively and validate the resulting build.
JacobPEvansRebase pull requests onto main with signed commits and GitHub API checks.
