Say I have a core-master branch and a core-client1 branch, that have split a good while ago (>2months).

core-master is used by our main product, and core-client1 was needed for a white-label version for a client. We couldn't merge until now cause of release schedules.

Now that it's possible, I'm merging the core-client1 changes back to core-master.

I would like to "break up" the conflict resolutions into separate commits so they could be reviewed/PR'd separately, and reverted separately if needed.

But since I have conflicts remaining - git won't let me commit some of the files.

I realize I could mark all as resolved and start going back to them - but then I would have to keep track of which files saved myself, and the history would be such that commited conflicts exist in the repo for many of the commit states.

I've searched around for "git partial merge commit" "git split merge" but have only found info about picking certain commits from core-master, which is irrelevant in my case.

Is there a proper way to do this?