Ah, the dreaded resolve conflicts message. You've finished crafting the perfect code, just a quick merge in of master (ahem, main) before you submit your PR, and then... 💥 If only there was an early warning system for merge conflicts so you could ...

Markdown supported · ⌘↵ to post
Catalin Pit
Oh wow, this is so useful! I hate the "surprise" of merge conflicts! 🤯
Thank you for sharing!