Resolving merge conflicts

Short and direct. It always finishes the merge and commits, and never aborts, so review the result before you push.

• LicenceMIT
• FrontmatterValid name and description
• Risky patternsNone found
• Size15 lines
• Last checked27 Sept 2026 · 9d8114f8ef0b31f535a265fc05c364bd8cf2e2895a830040e06c22acb11f54b0

What it can touch

• Edits code

  Changes files in your project.

• Uses git

  Reads history or makes commits, branches or worktrees.

• Runs commands

  Runs shell commands such as tests, builds or installs.

Read the source

Fieldbook links to the original instead of copying it, so you always read the version you install.