Skip to content

Revert #59: restore flat Neo4j manifest (re-sequencing — land #54 first)#60

Merged
colombod merged 1 commit into
mainfrom
revert-59-structured-neo4j
Jul 14, 2026
Merged

Revert #59: restore flat Neo4j manifest (re-sequencing — land #54 first)#60
colombod merged 1 commit into
mainfrom
revert-59-structured-neo4j

Conversation

@colombod

Copy link
Copy Markdown
Collaborator

Undo the structured two-client Neo4j manifest change from #59 so PR #54 can merge cleanly.

Why

PR #54 edits amplifier-online.yaml based on the pre-#59 flat manifest form. With #59 currently merged, #54's base conflicts. This revert restores the manifest to the form #54 expects, enabling a conflict-free merge.

What's happening next

  1. Land docs: remove Docker artifacts (keep S360 server image), add local-first Docker-for-Neo4j workflow #54 (v6.6.6 image, no rebase)
  2. Create a fresh PR on top of docs: remove Docker artifacts (keep S360 server image), add local-first Docker-for-Neo4j workflow #54 with:

This re-sequencing preserves #54's integrity and lets the new structured work land cleanly on top.

@colombod
colombod merged commit 70780a9 into main Jul 14, 2026
3 checks passed
@colombod
colombod deleted the revert-59-structured-neo4j branch July 14, 2026 22:51
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.

1 participant