Skip to content

🐛 fix: merge conflicting core migration leaf nodes (0040/0041) - #297

Merged
jc99k merged 1 commit into
mainfrom
fix/conflicting-migration-0041
Jul 15, 2026
Merged

🐛 fix: merge conflicting core migration leaf nodes (0040/0041)#297
jc99k merged 1 commit into
mainfrom
fix/conflicting-migration-0041

Conversation

@jc99k

@jc99k jc99k commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

PR #283 (0040_metered_usage_record) and PR #295
(0040_auto_20260623_0025 → 0041_auto_20260623_0041) both branched off
0039_userprofile, leaving two leaf nodes in the core migration graph.
Add the merge migration so migrate has a single graph to apply.

Description

Please include a summary of the changes, relevant motivation and context.

Issue

  • Github Issue ID.

Checklist before requesting a review

  • I have performed a self-review of my code.
  • My code follows the style guidelines of this project.
  • I have made corresponding changes to the documentation.
  • New and existing tests pass locally with my changes.
  • If this change is a core feature, I have added thorough tests.
  • If this change affects or depends on the behavior of other estela repositories, I have created pull requests with the relevant changes in the affected repositories. Please, refer to our official documentation.
  • I understand that my pull request may be closed if it becomes obvious or I did not perform all of the steps above.

PR #283 (0040_metered_usage_record) and PR #295
  (0040_auto_20260623_0025 → 0041_auto_20260623_0041) both branched off
  0039_userprofile, leaving two leaf nodes in the core migration graph.
  Add the merge migration so `migrate` has a single graph to apply.
@jc99k
jc99k requested a review from erick-GeGe July 15, 2026 20:08
@jc99k
jc99k merged commit b540a8e into main Jul 15, 2026
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