9
u/Independent_Zone6816 Apr 01 '24
Do you have kids? If not that means she created a pull request, and you didn't merge your branch with hers.
5
4
u/planetvermilion Apr 02 '24
i wish you as few merge conflicts as possible, especially if you're going for the cherry picking
2
2
u/jakeStacktrace Apr 02 '24
Don't worry with the latest patch this will stop happening.