this post was submitted on 17 Jul 2023
510 points (100.0% liked)
Programmer Humor
32453 readers
865 users here now
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
- Posts must be relevant to programming, programmers, or computer science.
- No NSFW content.
- Jokes must be in good taste. No hate speech, bigotry, etc.
founded 5 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
git rebase -x theirs origin/mainand then look at the lines your changing to see what needs to be retouchedI’m more of a
git push origin/main —forceguy myselfReject "main" branch, embrace master branch