Skip to content

feat(task-018): Support DB column and table renames via @DbRename#23

Merged
stijnvanbael merged 8 commits intomainfrom
copilot/support-db-column-renames
Apr 6, 2026
Merged

feat(task-018): Support DB column and table renames via @DbRename#23
stijnvanbael merged 8 commits intomainfrom
copilot/support-db-column-renames

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 3, 2026

  • Diagnose root cause: all previous "merge" commits had only one parent (committed via git add . && git commit instead of a true merge commit), so GitHub's 3-way diff used the old fork point (c7c3cf6) as merge base and re-detected conflicts
  • Reset local to remote HEAD (7c3a33a)
  • Run git merge origin/main to set MERGE_HEAD=17bf6ae
  • Resolve all 5 conflicts using the previously-correct resolutions
  • Commit as a proper two-parent merge commit (parent 7c3a33a + parent 17bf6ae)
  • Verified: test merge of branch into main completes with "Automatic merge went well"

… in DB migrations

Agent-Logs-Url: https://github.com/stijnvanbael/prefab/sessions/6c3cb439-5bf3-4006-97b0-2d0b091be8a2

Co-authored-by: stijnvanbael <1050148+stijnvanbael@users.noreply.github.com>
Copilot AI changed the title [WIP] Add support for database column renames feat(task-018): Support DB column and table renames via @DbRename Apr 3, 2026
Copilot AI requested a review from stijnvanbael April 3, 2026 10:59
@stijnvanbael stijnvanbael marked this pull request as ready for review April 4, 2026 07:03
Copilot AI and others added 2 commits April 4, 2026 07:17
…ongoMigrationPlugin

Agent-Logs-Url: https://github.com/stijnvanbael/prefab/sessions/91913aa4-4f06-43e7-b294-3631466241eb

Co-authored-by: stijnvanbael <1050148+stijnvanbael@users.noreply.github.com>
…ard in DatabaseChange

Agent-Logs-Url: https://github.com/stijnvanbael/prefab/sessions/91913aa4-4f06-43e7-b294-3631466241eb

Co-authored-by: stijnvanbael <1050148+stijnvanbael@users.noreply.github.com>
…and restoring schema registry conditional

Agent-Logs-Url: https://github.com/stijnvanbael/prefab/sessions/728677fc-1e31-4d21-8033-25fe940e64c0

Co-authored-by: stijnvanbael <1050148+stijnvanbael@users.noreply.github.com>
…lving conflicts

Agent-Logs-Url: https://github.com/stijnvanbael/prefab/sessions/be420f26-752e-496d-abac-cac0c9962ccf

Co-authored-by: stijnvanbael <1050148+stijnvanbael@users.noreply.github.com>
@stijnvanbael
Copy link
Copy Markdown
Owner

Rebase on main and resolve merge conflicts

…lving conflicts from non-null default change

Agent-Logs-Url: https://github.com/stijnvanbael/prefab/sessions/2a01ed69-e3ca-4f86-bd84-fc036771c059

Co-authored-by: stijnvanbael <1050148+stijnvanbael@users.noreply.github.com>
…oper two-parent merge commit

Co-authored-by: stijnvanbael <1050148+stijnvanbael@users.noreply.github.com>
@stijnvanbael stijnvanbael merged commit 9098502 into main Apr 6, 2026
1 check passed
@stijnvanbael stijnvanbael deleted the copilot/support-db-column-renames branch April 6, 2026 04:52
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