Skip to content

docs: howto resolve migration conflict#590

Merged
fyliu merged 2 commits into
hackforla:mainfrom
fyliu:442-howto-resolve-migration-conflicts
Jun 11, 2026
Merged

docs: howto resolve migration conflict#590
fyliu merged 2 commits into
hackforla:mainfrom
fyliu:442-howto-resolve-migration-conflicts

Conversation

@fyliu

@fyliu fyliu commented Nov 22, 2025

Copy link
Copy Markdown
Member

Fixes #442

What changes did you make?

  • Added how-to page on resolving migration conflicts

Why did you make the changes (we will use this info to test)?

  • This happens often when we're making database changes, so it's good to have a guide for it.

Screenshot

Details 2026-05-21 16 10 46 localhost 88dabac01f74

@ExperimentsInHonesty ExperimentsInHonesty moved this to PR Needs review (automated column, do not place items here manually) in P: PD: Project Board May 8, 2026
@fyliu fyliu force-pushed the 442-howto-resolve-migration-conflicts branch 2 times, most recently from fb983b9 to 4686afe Compare May 21, 2026 23:06
@fyliu

fyliu commented May 21, 2026

Copy link
Copy Markdown
Member Author

I refined the wording with AI and made other minor changes like adding a link in the index page.

@fyliu fyliu requested a review from bhamrickatmills May 21, 2026 23:13
@fyliu fyliu marked this pull request as ready for review May 21, 2026 23:13
@fyliu fyliu self-assigned this May 22, 2026

@bhamrickatmills bhamrickatmills left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Thank you. That was very clear. I'll probably need to use this doc in the future.

@fyliu fyliu force-pushed the 442-howto-resolve-migration-conflicts branch from 4686afe to 1e19a0f Compare June 11, 2026 21:01
@fyliu fyliu merged commit 798d877 into hackforla:main Jun 11, 2026
2 checks passed
@github-project-automation github-project-automation Bot moved this from PR Needs review (automated column, do not place items here manually) to ✅Done in P: PD: Project Board Jun 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: ✅Done

Development

Successfully merging this pull request may close these issues.

Add missing documentation on how to resolve migration conflicts in Github and Django

3 participants