Doesn’t git status tell you what to do?

use “git add <file>…” to mark resolution

use “git commit” to conclude merge

I always use git status to check what is appropriate before doing anything else, since the right thing to do can sometimes be different, like after using git rebase when a break command was used vs when a squash command resulted in a conflict.