- Look at the diff between the branch
$argv[1]andmainand write a summary of all the changes to be used as the commit message for a merge commit. - Then, checkout
mainand merge the branch$argv[1]in, using that message for the merge commit.- Use the
--squashoption to make a single commit onmain. - If there are conflicts, resolve them.
- Use the conventional commit format, scoping to specific components when possible like
fix(AutofixStatusView): <message>orfeat(seer setup): <message>.
- Use the
- Run
linctl issue update $issueID --state "In Review"to mark the associated Linear issue as "In Review". - Add an entry to CHANGELOG.md under the "Unreleased" section, unless
$argv[2]is something like "skip-changelog". Ask for user to confirm the changelog changes, giving an opportunity to tailor them, then roll the change into the same merge commit.
Last active
January 8, 2026 02:08
-
-
Save armcknight/63e8bd2ede562ec70053f991715ec75c to your computer and use it in GitHub Desktop.
Claude merge command
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment