3 ms·

GitLab does have it already: https://docs.gitlab.com/ce/user/project/merge_requests/resolve_conflicts.html https://docs.gitlab.com/ce/user/project/merge_request

• wyldfire 10y ago
  That's flipping awesome. Does it already have code review too?
  • sytse 10y ago
    Yes, with versions.
• messutied 10y ago
  haha I was just guessing and there you have it ^^ I'm slowly switching to Gitlab, only issue is its slighly slower than Github