I have a fair amount of work in my dev branch, but am being told there are conflicts (there shouldn't be as I have not pushed anything to main since creating this branch ...
There is a reset on main option, but i feel like last time i did that i still lost my branch developments, and i really don't want that : (