merge-develop

name	merge-develop
description	Merge the latest origin/develop into the current branch, validate the result, and leave the merge commit local.

Codex invocation: use $merge-develop or select this skill through /skills. References below to /merge-develop describe the source repository command.

Use this command to bring the current branch up to date with the latest origin/develop.

The result should be a validated local merge commit, ready for manual push.

Input

/merge-develop does not take arguments.

If arguments are provided, report it and stop.

Preconditions

Before starting, verify that:

• the current branch is detected;
• the working tree is clean;
• there are no staged, unstaged, or untracked changes;
• there is no merge, rebase, cherry-pick, revert, or bisect operation already in progress.

If any precondition is not met, report it and stop.

Workflow

1. Detect the current branch.
2. Fetch the latest origin/develop and update the local remote-tracking ref with git fetch origin refs/heads/develop:refs/remotes/origin/develop.
3. Record:
   • current branch name;
   • starting current branch commit SHA;
   • fetched origin/develop commit SHA from refs/remotes/origin/develop after the fetch.
4. Check whether the current branch already contains the freshly fetched refs/remotes/origin/develop commit.
   • If yes, report that no merge is needed and stop.
5. Start the merge without committing using git merge --no-ff --no-commit refs/remotes/origin/develop.
6. Resolve conflicts, if any, preserving the intended behavior from both the current branch and origin/develop.
7. When resolving conflicts, make sure public APIs, configuration, migrations, tests, documentation, and lockfiles remain consistent.
8. If a lockfile has conflicts, resolve the package manifest conflicts first and then regenerate the lockfile with the project package manager.
9. Run the project validation commands for:
   • autofix (pnpm lint:fix)
   • lint (pnpm lint)
   • typecheck (pnpm typecheck)
   • Rust core tests (pnpm test:core)
   • renderer unit tests (pnpm test:unit:renderer)
   • integration tests (pnpm test:integration)
   • component tests (pnpm test:components)
   • hook tests (pnpm test:hooks)
   • e2e tests (pnpm test:e2e)
   • build (pnpm build)
10. If validation fails, fix clear merge-related issues, rerun the relevant checks, and ask the user if the correct resolution is ambiguous.
11. When validation passes, create the merge commit with git commit.
12. Leave the merge commit local. Do not push unless the user explicitly asks.
13. Report the result.

Required output

Report:

• current branch;
• whether a merge was needed;
• files with conflicts and how they were resolved;
• final status: local merge commit created and ready for manual push.