Maybe a bit off-topic, but still on the topic of git and merge conflicts: Soon I will have to do a pretty big merge, with so many conflicts expected that I don

Maybe a bit off-topic, but still on the topic of git and merge conflicts: Soon I will have to do a pretty big merge, with so many conflicts expected that I don't know if I can resolve them in one day. So usually when I have such a non-minimal task, I create a branch for it. Is there any sensible way to do a merge in a branch, and resolve the conflicts on a file-by-file base, with separate commits for each one? Or maybe some other way to break down many merge conflicts into several small pieces? (We have a heavily patched version of an open source project at $work, and whenever there is a new upstream release, merging is a huge pain. We do try to contribute some of our changes back to upstream, but many changes are simply too specific to go upstream).