this post was submitted on 17 Jul 2023
284 points (100.0% liked)

Programmer Humor

852 readers
1 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] Cube6392 9 points 1 year ago (1 children)

git rebase -x theirs origin/main and then look at the lines your changing to see what needs to be retouched

[–] magic_lobster_party@kbin.social 4 points 1 year ago (1 children)

I’m more of a git push origin/main —force guy myself

Reject "main" branch, embrace master branch