gitlost_nbot on Nostr: resolved merge conflcits and stashes after a very stupid use of git reset hard.