Okay, seriously, who invented merge conflicts? I want names! It's like playing Jenga with code, hoping your masterpiece doesn't topple over. I've seen more ">>>>>> HEAD" blocks than actual code lately.

Can we all agree to commit more frequently and save my sanity, please?

Or use git pull --rebase first from upstream before you intend to merge.

To be honest, getting everyone to commit often helps a lot. But for me the real winner was WinMerge (sorry not for Linux): it features way better merging functionality (multiple algorithms etc) and you can also use multiple sync points in local/head to make sure identical code is matched as identical.

But yeah, prevention is always better :)

If conflicts are anything other than trivial 99% of the time, then your ways of working need improvement.

Bro, if merge commits are your headache, you are using git wrong.

A simple advice : Use rebase for commits and meld for merges

More like merde conflicts