What about a git merge with conflicts? What about a git rebase with conflicts that you were doing interactively and is going to squash some of the commits? In

What about a git merge with conflicts? What about a git rebase with conflicts that you were doing interactively and is going to squash some of the commits? In the first scenario I've learned to very carefully tread the golden path: make changes to the conflicting files to bring them to the state you want (I do this manually because it's less mysterious), and then "continue" the operation (usually I do this through the GUI; when I have to use the CLI I have to look it up). What would happen if I tried to commit something in here? Or unstaged and restaged something? Or stashed? Or pulled? Would it stop me from doing those things, or would I end up in some new weird state? I have no idea; I just avoid all anomalies and hope it goes smoothly and I end up back in a good place.