GitLab

Created by: Petchimuthu

We are using the GitLab 8.6.4 version.

While submitting the merge request from GitLab the following message appears :

This merge request contains merge conflicts

Please resolve these conflicts or ask someone with write access to this repository to merge this request manually.

But when we try to merge the same in local via command it merges without any conflicts.

Please help me to find out the issue.

Thanks, Muthu.