Fetch and reset rather than pull to avoid merge conflicts (!119) · Merge requests · GitLab.com / GitLab Docs · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Achilleas Pipinellis requested to merge rake-fetch-reset into master Sep 04, 2017

Avoid https://gitlab.com/gitlab-com/gitlab-docs/-/jobs/31284572

=> Pulling docs/trigger-preview of https://gitlab.com/gitlab-org/gitlab-ce.git
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.