Skip to content

Fix 9.2 conflicts for "Update docs for multiple assignees"

username-removed-407765 requested to merge 9-2-stable-fix-conflicts-for-ee-mr-1940 into 9-2-stable-ee
  • Encountered conflicts while picking !1940 (merged) onto 9-2-stable-ee
  • Please fix the conflicts and merge this into 9-2-stable-ee

Output of git status after failed merge

On branch 9-2-stable-ee
Your branch is up-to-date with 'origin/9-2-stable-ee'.
You are currently cherry-picking commit 5bf3e7c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

        deleted by us:   doc/user/project/issues/issues_functionalities.md

no changes added to commit (use "git add" and/or "git commit -a")

/cc @ClemMakesApps @selfup

Edited by username-removed-407765

Merge request reports