[lightgreen]

> Does stacked git help with this?

There's no magic in resolving merge conflicts, stgit helps only to some degree.

For example, stgit allows you to not fix all conflicts at once. You have a stack, and you may have first commit in a stack rebased, have a nice usable repo state, and return to rebasing of the second commit tomorrow.