lindeng
I did specify that rewriting shared history is going to cause you trouble (unless you really know your way around things), but apparently it wasn't clear enough
You're not meant to delete commits like that. Git encourages you to stop "lying about the past", and you will run into a fair amount of trouble if you try to do so with shared history. You don't remove a commit "backwards" and change history; you add a new commit that undoes the previous one (git revert)
I mention this because I, too, fell in love with org-mode and magit, and for a while I kept using Emacs only for those tools. Org quickly became a cornerstone of my workflow and made it easy to separate notes and tasks for different clients. I think Obsidian leaves maybe a bit much up to our imagination, but that's part of the beauty of it, imo
Currently sticking Obsidian (because it's discoverable, fast and extensible) and Neovim (only because Emacs is too antiquated)