#mergeconflicts

[jonfazzaro]

"'It was fine before we added your code' doesn't mean that the team merged last did a poor job. This is counterintuitive but worth considering. If the merges had happened in the opposite order, the other team would seem to be at fault."

[roshangalaxy]

🌱📺Let's Restore A Little Nature Town As A Cute Robot!📺🌱

On this edition of Indie Saturday, we'll be playing @/MergeConflict's Re:Fresh. As a sucker for robot characters dealing with nature, I'm excited for this game! 🤖🌿

See you all @ 2pm EDT ⏰

[menemennpastirma]

Time To Merge.

(via Instagram - themonkeyuser - https://www.instagram.com/p/CLoIr5uKWYP/)

⁣⁣⁣#monkeyuser #development #devhumor #bug #pullrequest #merge #mergeconflict #fun #funny #funnytext #humor #humorous #amusing

[programmerhumour]

if (mergeConflict) {die;}

[commentsense888]

if (mergeConflict) {die;} by comparch https://www.reddit.com/r/ProgrammerHumor/comments/b29y9i/if_mergeconflict_die/?utm_source=ifttt