Resolves database schema version conflicts by automatically selecting the most recent migration timestamp.
This skill automates the resolution of Git merge conflicts within database schema files, specifically focusing on the version timestamp in files like db/schema.rb. When multiple developers run migrations simultaneously, conflicts often occur in the schema versioning. This tool uses git diff to identify these conflicts and programmatically chooses the latest timestamp to ensure the schema reflects the most up-to-date state of the database, saving developers from tedious manual editing and potential migration errors.
Key Features
01Automatic conflict detection in db/schema.rb
02No-op safety check for clean schema files
03Preserves schema integrity by ignoring non-version changes
04Smart timestamp comparison and selection
050 GitHub stars
06Seamless integration with standard Git workflows
Use Cases
01Automating migration resolution in multi-developer Ruby on Rails environments
02Merging feature branches with concurrent database migrations
