resolving-merge-conflicts

Resolve existing conflict hunks during an in-progress Git merge or rebase. Use when Git reports unresolved merge/rebase conflicts; do not use for ordinary branch integration or speculative cleanup.