Is there a git merge strategy which can resolve next merge conflict?
TLDR;
Is there a git merge strategy which can resolve next situation?
TLDR;
Many users committing frequently to single file in GIT results in frequent conflicts
We have more than 500 users committing frequently to single SQL file (Liquibase) which results in frequent conflicts.
Have someone been able to fix this or handle this issue efficiently?