Rebase feature branch, merge commit into main (NO SQUASH).
this post was submitted on 04 Apr 2024
1118 points (98.1% liked)
Programmer Humor
22837 readers
191 users here now
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
Rules
- Keep content in english
- No advertisements
- Posts must be related to programming or programmer topics
founded 2 years ago
MODERATORS
Fuck a merge commit! Rebase ervray day bay bayyy.
git merge --no-ff
git config --global merge.ff no
ITT: people who have no idea how rebasing works.
Skill issue tbh
No doubt. git rebase is like a very sharp knife. In the right hands, it can accomplish great things, but in the wrong hands, it can also spell disaster.
As someone who HAS used it a fair amount, I generally don't even recommend it to people unless they're already VERY comfortable with the rest of git and ideally have some sense of how it works internally.
load more comments
(10 replies)
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
load more comments
(1 replies)
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.
Yeah totally merge everything, people like a good spaghetti salad.
spaghetti salad
Found the German :D
Daily circlejerk
Did she just tell people up git good?
I know how to use git pull, git push, git commit, git status and git add *. I don't even know how git commit and git push works I just know you run them in that order. Whenever I break everything I give up and go outside.