And nothing else? Using the default merge flow is super simple, rebasing with force pushes is often hell. Reverting with conflicts is hell as well, I sometimes prefer to do undo commit than to revert (I know).
Anyway git is rather simple if you stick to the basics and I feel like that’s enough. I avoid rebase like plague, I dont care about merge commits at all.
git pull git add . git commit git merge git push git status git log git checkout — filename
And nothing else? Using the default merge flow is super simple, rebasing with force pushes is often hell. Reverting with conflicts is hell as well, I sometimes prefer to do undo commit than to revert (I know).
Anyway git is rather simple if you stick to the basics and I feel like that’s enough. I avoid rebase like plague, I dont care about merge commits at all.