https://github.com/knu/git-merge-structure-sql

git merge driver for db/structure.sql of Rails projects
https://github.com/knu/git-merge-structure-sql

Last synced: about 2 months ago
JSON representation

git merge driver for db/structure.sql of Rails projects

• Host: GitHub
• URL: https://github.com/knu/git-merge-structure-sql
• Owner: knu
• License: bsd-2-clause
• Created: 2018-11-29T14:56:59.000Z (almost 6 years ago)
• Default Branch: master
• Last Pushed: 2024-06-27T09:32:14.000Z (3 months ago)
• Last Synced: 2024-07-05T15:01:47.460Z (3 months ago)
• Language: Ruby
• Size: 19.5 KB
• Stars: 31
• Watchers: 4
• Forks: 3
• Open Issues: 2
• Metadata Files:
  • Readme: README.md
  • Changelog: CHANGELOG.md
  • License: LICENSE.txt

Awesome Lists containing this project

README

        
# git-merge-structure-sql

This is a merge driver for Git that resolves typical merge conflicts

in a `db/structure.sql` file of Rails.

When your project is configured with

`config.active_record.schema_format = :sql`, the database schema is

kept in `db/structure.sql` instead of `db/schema.rb` in the native

dump format of the underlying database engine, which is not suitable

for the default merge driver of Git to deal with.  As a result, when

you try to merge two branches you always have to resolve trivial

conflicts manually if new schema migrations take place in both

branches.  This custom driver takes away such a pain.

Currently only PostgreSQL, MySQL and SQLite3 dump formats are

supported.

## Installation

Run this:

    $ gem install git-merge-structure-sql

And enable it yourself in your Git configuration, or let it do that

for you by this command:

    $ git-merge-structure-sql --install

This adds necessary settings to your `~/.gitconfig` or

`$XDG_CONFIG_HOME/git/config` and the default gitattributes(5) file to

enable the merge driver for structure.sql files.

If you want to enable this driver only in the current git directory,

run this:

    $ git-merge-structure-sql --install=local

## Usage

Once enabled, Git should call this driver as necessary when it needs

to merge changes made in structure.sql.

## History

See `CHANGELOG.md` for the version history.

## Author

Copyright (c) 2018-2021 Akinori MUSHA.

Licensed under the 2-clause BSD license.  See `LICENSE.txt` for

details.

Visit the [GitHub Repository](https://github.com/knu/sidetiq-timezone)

for the latest information.