Reapply a commit that was undone by conflict?

That's what git cherry-pick is for. It lets you apply changes by using already existing commits.

The basic syntax is:

git cherry-pick <commit> ...