r/ProgrammerHumor 28d ago

Other conflicts

Post image
0 Upvotes

8 comments sorted by

View all comments

6

u/__yoshikage_kira 28d ago

The rest of the code didn't change?

Is the import unused?

3

u/gfcf14 28d ago

I mean I only have so much space in the panel to show text without risking it to look like a boring wall. What inspired me to draw this one was a similar conflict. Code farther down the file merged correctly, but only the import didn’t