It's our source delivery process.
After code review, we will merge branch into master
Unfortunately, if multiple programmers edit the same source code, it may occur conflicts. Hence, GitLab cannot merge automatically.
Step 1. After do Team => Merge, it will show you conflict list
Step 2.Do Team => Synchronize workspace => right click => Merge Tool
Step3. Start do edit the conflicts
Step4. right click => Mark as Merged
Step 5. Commit and again
Step 6. After resolved conflict source codes and commit and push to Git. You can see the merge request can be merged into master now.