More posts
Why a clean merge can still break main
Two pull requests can pass alone and merge without text conflicts while breaking the combined build. Here is a small example and the workflow that catches it.
Eight ways branches collide
Eight concrete merge-conflict patterns, from renamed helpers to competing writes, and how to decide which need a fix or human judgment.
Keep humans in control of automatic conflict resolution
Start in Advisory, inspect the evidence, then choose how far Merget can act. A practical guide to modes, merge requirements and a first repository.