This means that you need to explicitly tell Git that you’ve resolved a conflict at each file or folder (that is path).
1. Look at the list of files with yet unresolved conflicts
git status
2. Mark each file as resolved
Once you have resolved conflicts in a file, add it to mark that conflicts are resolved:
git add file-which-had-conflicts
If you would like to remove the file instead of resolving conflicts, do it with git rm. However, it’s a rare case.
git rm file-which-had-conflicts
3. Proceed with rebase/merge/whatever
git rebase --continue
git merge --continue
git cherry-pick --continue