Skip to content

Instantly share code, notes, and snippets.

@armcknight
Last active January 8, 2026 02:08
Show Gist options
  • Select an option

  • Save armcknight/63e8bd2ede562ec70053f991715ec75c to your computer and use it in GitHub Desktop.

Select an option

Save armcknight/63e8bd2ede562ec70053f991715ec75c to your computer and use it in GitHub Desktop.
Claude merge command
  • Look at the diff between the branch $argv[1] and main and write a summary of all the changes to be used as the commit message for a merge commit.
  • Then, checkout main and merge the branch $argv[1] in, using that message for the merge commit.
    • Use the --squash option to make a single commit on main.
    • If there are conflicts, resolve them.
    • Use the conventional commit format, scoping to specific components when possible like fix(AutofixStatusView): <message> or feat(seer setup): <message>.
  • 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment