Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minimize conflicts #240

Merged
merged 5 commits into from
Feb 5, 2024
Merged

Minimize conflicts #240

merged 5 commits into from
Feb 5, 2024

Conversation

xjunior
Copy link
Contributor

@xjunior xjunior commented Feb 5, 2024

Minimize merge conflicts

Based on:

https://github.com/lfittl/activerecord-clean-db-structure

  • Extract sanitize_migration_timestamps to mysql
  • Minimize conflicts in schema migrations
  • Always load the defaults for the current version being tested

@xjunior xjunior requested a review from a team as a code owner February 5, 2024 18:05
garettarrowood
garettarrowood previously approved these changes Feb 5, 2024
View reviewed changes
Copy link
Member

@garettarrowood garettarrowood left a comment

Choose a reason for hiding this comment

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

Woot! I think this should turn a lot of 2-line-addition migrations into 1-line, and thus reduce merge conflicts. Thank you for this!

jonwmarshall
jonwmarshall previously approved these changes Feb 5, 2024
View reviewed changes
Copy link

@jonwmarshall jonwmarshall left a comment

Choose a reason for hiding this comment

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

Nice! Love to see it!

@xjunior xjunior dismissed stale reviews from jonwmarshall and garettarrowood via 3c8e68b February 5, 2024 18:14
@powerhome-portal
Copy link

A change to documentation files was detected in your PR. Please visit this link to preview changes: https://portal-staging.powerapp.cloud/docs?filters[kind]=all&filters[user]=all&filters[namespaceFilter]=minimize-conflicts

@xjunior xjunior enabled auto-merge (squash) February 5, 2024 18:19
@xjunior xjunior merged commit 1ff3b89 into main Feb 5, 2024
143 checks passed
@xjunior xjunior deleted the minimize-conflicts branch February 5, 2024 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wadewinningham wadewinningham wadewinningham approved these changes

@jonwmarshall jonwmarshall jonwmarshall left review comments

@garettarrowood garettarrowood garettarrowood left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@xjunior @wadewinningham @garettarrowood @jonwmarshall