Merge/rebase a commit with one file conflict, accept upstream, can't add and continue, can't skip or I'll lose newly added files

Question

Sorry for the long title, but this is a very specific question. Let me describe it better.

I am working in a branch, let\'s call it new-feature. I change some code, and