Fix merge conflicts for migrations
@DSASanFrancisco/portal-members
Changing the revisions for migrations so they can be applied sequentially.
Merge Request Rules
Author
- If the MR isn't finished, prepend "WIP" to the title.
- Unless otherwise noted, you should merge after approval.
Reviewer
- Comments aren't necessarily blockers but can be. Add
[blocker]
, or something similar, to a comment as necessary, otherwise the author may not know what's a blocker and what's not. - Bias toward approving the MR and ask for follow-up work as needed. You can make these issues as needed.
- Be proactive about approving. If you and other reviewers make comments, and yours are resolved by the author, use your judgement to either approve or follow up with the other reviewers. Again, bias toward approving.