While on feature branch, trying to take uncommitted changes onto main branch led to unresolved index

Question

Using git v2.29.2 on Fedora Linux.

I think my workflow is poor so thought I\'d ask how to improve it. I\'ll probably clean up the mess by backing up files and hard r