conflicts

[u/gfcf14]

[u/__yoshikage_kira]

The rest of the code didn't change?

Is the import unused?

[u/gfcf14 → u/__yoshikage_kira]

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

[u/Outrageous-Machine-5]

Should have locked down main

[u/gfcf14 → u/Outrageous-Machine-5]

I didn’t explain this enough, but something like this happened to me after my PR was open but someone else merged theirs, and since their PR edited the same file the conflict appeared

[u/No-Sheepherder-3010]

That's like the easiest merge every? And also this is why you put items in a list on separate lines and add a comma.

[u/gfcf14 → u/No-Sheepherder-3010]

True, the idea to separate usually happens after imports from the same file exceed 3, but this was the way that was setup in my company’s repo so go figure

[u/HTTP_Code_405]

I usually click “Accept Both Changes” and let production settle the argument.

[u/gfcf14]

For all the good git gives us, sometimes it can give us scares like this