`git add --resolved` is a wonderful idea, and definitely something I would start using.