Results for “merge-conflict”

6 skills

Provides Git commands and workflows for commits, branches, rebases, merges, conflict resolution, history recovery, and team collaboration, with safety rules for force-pushing and destructive operations.

More results

Merge the winning agent's branch into the base branch, archive losing branches via git tags, and clean up worktrees after an AgentHub competition session.

Land And Deploy

Land and deploy workflow. (gstack)

Land And Deploy

Land and deploy workflow. Merges the PR, waits for CI and deploy, verifies production health via canary checks. Takes over after /ship creates the PR. Use when: "merge", "land", "deploy", "merge and verify", "land it", "ship it to production". (gstack)

projectious-work

Repo Management

Reconcile repository issues, pull requests, merge requests, local git state, commits, and pushes across GitHub, GitLab, Gitea, Forgejo, Codeberg, Bitbucket, Azure DevOps, and SourceHut.

Document a recently solved problem to compound your team's knowledge or CONCEPTS.md, the project's shared domain vocabulary.