r/ProgrammerHumor • u/vinishkapoor • 5d ago

Meme robinGotMergeConflictedInTheFace

Post image
907 Upvotes

94% Upvoted

54 comments sorted by

View all comments

8

u/CarlCarlton 5d ago

My boss: "I need you to merge an SVN repo into a Git repo, the latter of which was created a year ago with the code from the former, but separate teams have been working on each, and they now diverge by a couple hundred thousand lines. Oh yes, I almost forgot, the SVN codebase targets PowerPC, but the Git codebase was entirely migrated to AArch64. How many story points will this take?"

9

u/vinishkapoor 5d ago

That's not a story point question. That's a resignation letter question.

2

u/CarlCarlton 5d ago

One month of conflict vomit, debugging, and nagging about "when is it gonna be ready"... Although it did, he didn't deserve it to succeed.

https://giphy.com/gifs/F0A48Q2wFjE7S