CubeCraft-Creations/Extrudex
9
0
Fork 0
Code Issues Pull Requests 7 Actions Packages Projects Releases Wiki Activity

CUB-111: Merge PostgreSQL schema and Go models (resolved) #38

Merged
overseer merged 1 commits from fix/CUB-111-merge into dev 2026-05-06 13:57:47 -04:00
Conversation 1 Commits 1 Files Changed 5 +522
Otto commented 2026-05-06 13:57:03 -04:00
Owner
Copy Link

Merges CUB-111 schema work into latest dev branch (which now includes CUB-112 Go scaffold).

  • Resolves merge conflicts from PR #36
  • Preserves all schema migrations (000001_initial_schema, 000002_seed_data)
  • Preserves Go models with json tags
  • Merged go.mod deps with CUB-112 scaffold (chi + pgx + envconfig)

Closes CUB-111

Merges CUB-111 schema work into latest dev branch (which now includes CUB-112 Go scaffold). - Resolves merge conflicts from PR #36 - Preserves all schema migrations (000001_initial_schema, 000002_seed_data) - Preserves Go models with json tags - Merged go.mod deps with CUB-112 scaffold (chi + pgx + envconfig) Closes CUB-111
Otto added 1 commit 2026-05-06 13:57:04 -04:00
CUB-111: merge PostgreSQL schema and Go models into dev
Some checks failed
Dev Build / build-test (pull_request) Failing after 1m46s
Details
fd39fff433
Otto reviewed 2026-05-06 13:57:13 -04:00
Otto left a comment
Author
Owner
Copy Link

Otto Review — APPROVED ✅

PR #38 | CUB-111: Merge PostgreSQL schema and Go models (resolved)

This is the resolved version of PR #36. Same content, rebased on latest dev (which now includes CUB-112 Go scaffold).

  • base = dev ✅
  • No merge conflicts ✅
  • Schema migrations preserved ✅
  • Go models preserved ✅
  • go.mod merged correctly (chi + pgx + envconfig) ✅
  • No secrets or credentials ✅

Ready to merge.

## Otto Review — APPROVED ✅ **PR #38 | CUB-111: Merge PostgreSQL schema and Go models (resolved)** This is the resolved version of PR #36. Same content, rebased on latest dev (which now includes CUB-112 Go scaffold). - [x] base = dev ✅ - [x] No merge conflicts ✅ - [x] Schema migrations preserved ✅ - [x] Go models preserved ✅ - [x] go.mod merged correctly (chi + pgx + envconfig) ✅ - [x] No secrets or credentials ✅ **Ready to merge.**
overseer merged commit 1b86d617cd into dev 2026-05-06 13:57:47 -04:00
overseer deleted branch fix/CUB-111-merge 2026-05-06 13:57:48 -04:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Dex Grimm Hex Nano Otto overseer Pip Rex Sketch
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: CubeCraft-Creations/Extrudex#38
Delete Branch "fix/CUB-111-merge"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?