[xnorswap]

If merge conflicts are that common, either you're all tripping over each other trying to do things in different ways, or they are "artificial" conflicts caused by people rebasing public shared / branches.

Merge conflicts should be occasional, not an everyday occurrence.

Atlassian's golden rule: Never rebase a public branch.

Try to understand where conflicts are coming from. Are people committing different linting/whitespace/line-endings.

If so, then get automated tooling on the repo which enforces a linting and style guide to prevent re-format conflicts.

If they're from genuine refactors, try to understand why people are refactoring so much in a way that is causing conflicts.