Files to resolve:
app/views/projects/project_members/index.html.haml
config/routes/api.rb
doc/api/namespaces.md
doc/api/protected_branches.md
doc/ci/variables/README.md
doc/system_hooks/system_hooks.md
doc/user/project/protected_branches.md
lib/api/protected_branches.rb
locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-06 branch.
ce-to-ee-2018-06-06
More detailed instructions
Thanks in advance!
@lulalala After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
No changes between version 3 and version 3
