resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.