Describe the problem your experiencing and how your idea helps solve this
I resolved conflicts in my branch by choosing the branch for everything, yet all my changes in my branch are gone and it matches the main file again.
Add as much context as possible (screenshots, Figma files, mockups, etc.)
Ask questions to bring the community into the conversation
(e.g. Does anyone else experience this? Is anyone using a plugin or workaround to help solve this?, etc.