this post was submitted on 14 Aug 2023
470 points (97.4% liked)
Programmer Humor
19154 readers
2012 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 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
If the changes are small enough I just do
rebase -Xtheirs main, and look to see if anything looks fucky (git diff main..).