Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.
Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.