Skip to content

fix: route conflict checks through possible-conflicts API + fix bucket priority order#1603

Merged
stevenc987 merged 2 commits into
feature-solr-mergedfrom
feature-fix-conflict-priority-order
Jun 18, 2026
Merged

fix: route conflict checks through possible-conflicts API + fix bucket priority order#1603
stevenc987 merged 2 commits into
feature-solr-mergedfrom
feature-fix-conflict-priority-order

Conversation

@Oluwapizzy

Copy link
Copy Markdown
Collaborator

SUMMARY
RE-commit current local branch to remote branch which is wrong due to mistaken conflicts resolved/accepted.

@stevenc987

Copy link
Copy Markdown
Collaborator

/gcbrun

@stevenc987

Copy link
Copy Markdown
Collaborator

/gcbrun

@cd-runner

cd-runner Bot commented Jun 17, 2026

Copy link
Copy Markdown

Temporary Url for review: https://namex-dev--pr-1603-8dcl2b5q.web.app

@stevenc987

Copy link
Copy Markdown
Collaborator

/gcbrun

@cd-runner

cd-runner Bot commented Jun 18, 2026

Copy link
Copy Markdown

Temporary Url for review: https://namex-dev--pr-1603-8dcl2b5q.web.app

@stevenc987 stevenc987 merged commit 0e7c695 into feature-solr-merged Jun 18, 2026
13 checks passed
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