Skip to content

docs(adr): propose multi-identity login and user-merge design#196

Draft
markcrivera wants to merge 1 commit into
mainfrom
docs/user-merge-design
Draft

docs(adr): propose multi-identity login and user-merge design#196
markcrivera wants to merge 1 commit into
mainfrom
docs/user-merge-design

Conversation

@markcrivera

@markcrivera markcrivera commented Jun 4, 2026

Copy link
Copy Markdown
Collaborator

Two proposed ADRs (MADR format, status: proposed) from the user-merge design discussion. Opening as a PR so the records are reviewable before the design goes to a GitHub Discussion for wider input.

  • ADR 0001 - multi-identity login: a User holds many Identities; login resolves provider + external key -> Identity -> User instead of by email. Foundation (Phase 1) for account-merge.
  • ADR 0002 - user-merge conflict resolution: fold a source User into a non-Admin target, target-wins union of Members with preview + per-role override, source soft-retired with mergedIntoId, audit at notice. (Phase 2.)

Both are status: proposed - this PR is for reviewing the decisions, not adopting them yet. Related: #171, #170, #183 (comment)

Two proposed ADRs from the user-merge design session: multi-identity login
(ADR 0001) and user-merge conflict resolution (ADR 0002). Both are status:
proposed pending discussion.

Signed-off-by: Mark Rivera <mcrivera@gmail.com>
@Amndeep7 Amndeep7 temporarily deployed to tir-docs-user-merge-des-398feg June 4, 2026 16:18 Inactive
@sonarqubecloud

sonarqubecloud Bot commented Jun 4, 2026

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants