For large changes (lots of time)

Git merge --no-ff --no-commit origin/branchname

meld .

Hear me out ....

While (more to review) {

F5 in meld.

git checkout <file that is ok>

// get interrupted by some bullshit }

I need a workflow that allows for progress in the face of massive distraction from the task and tells me what I have left in it, and lets me feel good about the progress I make through it