Sometimes there can be a automated solution to conflict management. We should have a few automated conflict resolvers (server wins, newest wins etc) to make lives easier for developers.
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira