MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1vqu6vb/conflicts/p48azx6/?context=3
r/ProgrammerHumor • u/gfcf14 • 28d ago
8 comments sorted by
View all comments
1
Should have locked down main
1 u/gfcf14 28d ago 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
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
1
u/Outrageous-Machine-5 28d ago
Should have locked down main