git merge --no-ff

Heres my based af workflow:

git checkout -b feature-branch

rebase on top of dev whilst working locally

git rebase origin/dev-branch && git push -f

if i need to fix conflicts with dev-branch during a PR

git merge origin/dev

Anyone mind explaining to me how git rebase is worth the effort?

git merge has it's own issues but I just don't see any benefit to rebase over it.

Rebase feature branch, merge commit into main (NO SQUASH).

Fuck a merge commit! Rebase ervray day bay bayyy.

I personally prefer "git off my lawn"

git rebase is only for terrorists. 🥸

Also for me when I’ve been drinking and committed some really stupid shit into the repo. No one needs to know what I really think of my team members.

I like rebase, it's everyone else that hate it when I rebase main twice a day.

Daily circlejerk

You had me a "Sydney Sweeney reveals".