We want to enable auto merging, however we are with a big amount of developers on the same repository +- 30.
I'm wondering what we should do to resolve any automerge conflicts in the best way. All our release branches can not be committed to directly, so you are obligated to create a PR to resolve the conflicts.
I noticed the automergeconflictdetector plugin allowing you to discover merge conflicts on cascading before merging the actual PR. People in reviews claim they resolve the conflicts preemptively, but how ?
I really wonder on how people implement the procedure to handle this and especially when there is a lot of developers involved it needs to be clear and well described.
