Merge conflicts don't put you into a detached head state. You stay on the branch where you ran git merge. Why would it change your checked out branch?

The special command is just `git add` to stage your changes followed by `git commit` (or do it all in one command as `git commit - a`), same as any other changes.

Rebase is something else. It's something you do on purpose because you specifically want to rewrite the history. Personally I use it a lot and expect everyone on my team to, but you can use git just fine without ever rebasing or even knowing it's there.

Like I actually have no idea what you're talking about. Is your criticism actually targeted at some specific UI tool that's not git?