merge: resolve PR #1168 conflicts (docs: Add RBAC system documentation)

[Copilot]

PR #1168 (blinkysc:feature/rbac-docs) was blocked by merge conflicts introduced after master added new condition types and a BreadcrumbForQuestId field that overlapped with the PR's breadcrumb-related additions.

Conflict resolutions

• docs/conditions.md — kept master's new condition types (104 CONDITION_AI_DATA, 105 CONDITION_RANDOM_DUNGEON, 106 CONDITION_UNIT_IN_COMBAT) and appended the PR's ### Breadcrumb Quests section; dropped a stray <!-- --> / - 0 (If target needs to be on land) artifact from the PR branch
• docs/quest_template_addon.md — kept master's ### BreadcrumbForQuestId field documentation (the proper fix); discarded the PR's workaround note advising against ExclusiveGroup, which is now superseded

Clean auto-merges

• docs/database-auth.md — RBAC entries added under M (module_rbac_permissions) and R (rbac_account_permissions, rbac_default_permissions, rbac_linked_permissions, rbac_permissions)
• docs/documentation-index.md — RBAC doc links added
• 6 new RBAC doc pages landed intact: rbac.md, rbac_permissions.md, rbac_linked_permissions.md, rbac_default_permissions.md, rbac_account_permissions.md, module_rbac_permissions.md

Original prompt

Resolve merge conflicts for PR #1168 in azerothcore/wiki (docs: Add RBAC system documentation).

Context:

• PR URL: docs: Add RBAC system documentation #1168
• PR is currently not mergeable (mergeable_state: dirty).
• Branch: blinkysc:feature/rbac-docs (maintainer_can_modify: true)

Task:

1. Check out/inspect the PR branch and merge/rebase with the base branch (master) to surface conflicts.
2. Resolve all merge conflicts in a way consistent with the repo’s documentation/index conventions.
3. Ensure indexes are updated correctly (especially docs/database-auth.md which is modified by the PR) while preserving any additions made on master since the PR diverged.
4. Run/verify any repo checks that are feasible (lint/markdown formatting if present) and ensure the branch builds/passes.
5. Push the conflict resolution commit(s) to the PR branch and open/update a PR as appropriate (if direct push to the existing PR branch is supported, prefer that; otherwise open a new PR).

Notes:

• The PR adds several new docs pages: docs/rbac.md, docs/rbac_permissions.md, docs/rbac_linked_permissions.md, docs/rbac_default_permissions.md, docs/rbac_account_permissions.md, docs/module_rbac_permissions.md.
• It also modifies: docs/database-auth.md, docs/documentation-index.md, docs/conditions.md, docs/quest_template_addon.md.
• Be careful to keep all relevant links under correct alphabetical sections, and avoid losing unrelated index entries introduced on master.

Deliverable:

• A PR branch with conflicts resolved and ready to merge, with a concise explanation of the resolutions made.

The following is the prior conversation context from the user's chat exploration (may be truncated):

User: resolve the merge confligts in 1168

Assistant: PR #1168 is currently not mergeable (mergeable_state: dirty), which indicates GitHub has detected merge conflicts that must be resolved on the PR branch (blinkysc:feature/rbac-docs) before it can be merged.

I can’t directly “click-resolve” conflicts from here without pushing commits to the PR branch, but I can tell you exactly what to do and what will likely conflict.

What’s conflicting

From the PR file list, the only file that overlaps a central index (and is very likely to conflict) is:

• docs/database-auth.md (PR adds several new links under sections M and R)

This file is a shared index and commonly changes on master, so it’s the prime conflict candidate.

How to resolve (recommended: resolve locally and push)

1. Fetch latest master and the PR branch:

   git fetch origin master
   git fetch origin pull/1168/head:pr-1168
   git checkout pr-1168

2. Merge master into the PR branch (this will surface conflicts):

   git merge origin/master

3. If you get a conflict in docs/database-auth.md, open it and resolve by keeping both:

   • whatever new entries were added on master, and
   • the PR’s new RBAC links:
     • module_rbac_permissions
     • rbac_account_permissions
     • rbac_default_permissions
     • rbac_linked_permissions
     • rbac_permissions

   Then:

   git add docs/database-auth.md
   git commit

4. Push back to the PR branch:

   git push

GitHub will re-check the PR and it should flip to mergeable once conflicts are gone.

If you want, I can generate the exact resolved docs/database-auth.md

To do that safely, paste the conflict markers version of docs/database-auth.md (the one containing <<<<<<<, =======, >>>>>>>) from your local merge attempt, and I’ll return the fully-resolved final file content for you to commit.

User: resolve them

Assistant: I’m waiting for you to confirm/approve the requested GitHub operation so I can proceed with resolving the merge conflicts in PR #1168.

This pull request was created from Copilot chat.