land

Merge the current PR and clean up the feature branch

SKILL.md

GitHub

Merge a PR and clean up its feature branch.

$ARGUMENTS optionally specifies a GitHub PR number (e.g., "166"). If omitted, infer the PR from the current branch using gh pr view.

Steps:

  1. Find the PR.

    • If $ARGUMENTS contains a PR number: use gh pr view <number> to get the PR's branch name, URL, and state.
    • If $ARGUMENTS is empty: use gh pr view (infers from current branch).
    • If the PR is not open, report the issue and stop.
  2. Check out the PR's branch if not already on it: git checkout <branch-name>.

  3. Merge the PR with gh pr merge <url> --squash --delete-branch. This squashes the PR's commits into a single commit on main and deletes both the local and remote feature branches.

  4. Switch to main: git checkout main.

  5. Pull remote main: git pull origin main.

  6. Verify branch cleanup. --delete-branch should have removed both local and remote. If either remains (e.g. gh couldn't delete the local branch because it wasn't fast-forward), finish the job:

    • git branch -D <branch-name> (squash merges require -D, not -d, because the squashed commit is not a descendant of the feature branch).
    • git push origin --delete <branch-name>
  7. Confirm cleanup with git branch and git status.