When there's a conflict in a Pull Request it usually does not make sense to start any actions like bamboo builds since they will fail anyway.
What happens in case of a busy bamboo queue is simply that a job will wait for a while and finally fail quickly when auto-merging is not possible.
Is there a way to make bitbucket do nothing in case of git conflict (just show that there's a conflict and that's it)?
