this post was submitted on 04 Apr 2024
1125 points (100.0% liked)

Programmer Humor

22837 readers
429 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

founded 2 years ago
MODERATORS
 
(page 2) 50 comments
sorted by: hot top controversial new old
[โ€“] [email protected] 12 points 1 year ago (1 children)

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.

[โ€“] [email protected] 7 points 1 year ago (1 children)

Yeah totally merge everything, people like a good spaghetti salad.

load more comments (1 replies)
[โ€“] [email protected] 10 points 1 year ago (5 children)

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.

[โ€“] [email protected] 8 points 1 year ago (5 children)

Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?

load more comments (5 replies)
load more comments (4 replies)
[โ€“] [email protected] 10 points 1 year ago* (last edited 1 year ago) (1 children)

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)
[โ€“] [email protected] 10 points 1 year ago (1 children)
load more comments (1 replies)
[โ€“] [email protected] 8 points 1 year ago

Fuck a merge commit! Rebase ervray day bay bayyy.

[โ€“] [email protected] 7 points 1 year ago* (last edited 1 year ago) (1 children)

I personally prefer "git off my lawn"

load more comments (1 replies)
[โ€“] [email protected] 7 points 1 year ago (2 children)

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

load more comments (2 replies)
[โ€“] [email protected] 6 points 1 year ago

You had me a "Sydney Sweeney reveals".

[โ€“] [email protected] 6 points 1 year ago

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

[โ€“] [email protected] 6 points 1 year ago

Daily circlejerk

load more comments
view more: โ€น prev next โ€บ