Merge Main FAQs

Question 1

Does it update my package dependencies after the merge?

Accepted Answer

Yes, the skill monitors for changes in common lockfiles (like package-lock.json, go.sum, or Cargo.lock) and will suggest running the appropriate install command for your language ecosystem.

Question 2

Does it work with branches other than 'main'?

Accepted Answer

Absolutely. While it defaults to the repository's primary branch, you can use the --base flag to specify any other branch, such as 'develop' or 'staging'.

Question 3

What happens if I have uncommitted work when I run this skill?

Accepted Answer

Merge Main performs a pre-flight check. If it finds uncommitted changes, it will prompt you to either stash them, commit them using an integrated commit workflow, or abort the merge.

Question 4

Can this skill handle merge conflicts automatically?

Accepted Answer

Yes, it identifies conflicted files and can automatically resolve trivial issues like whitespace or simple imports. For complex logic conflicts, it presents the context and asks for your guidance on how to combine the changes.

Question 5

How does the skill detect which branch is the 'main' branch?

Accepted Answer

The skill uses the GitHub CLI (gh) to query the default branch metadata. If the CLI is unavailable, it falls back to inspecting the remote HEAD configuration via Git commands.

Merge Main

主要功能

使用场景

Merge Main

主要功能

使用场景