ParentFull threadrecov·Same here. So far it's my favorite UX for solving non-trivial merge conflicts.View on HN