itspriddle
/ setup-git-bundler-merge-driver
Last active
August 13, 2018 08:41
This script makes git automatically run `bundle install` when a merge conflict with Gemfile.lock occurs. Run it once per project to setup `.gitattributes` and `.gitconfig`
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/usr/bin/env bash | |
| # Usage: setup-git-bundler-merge-driver | |
| # Help: Configures git to use a custom merge driver to resolve Gemfile.lock | |
| # merge conflicts. | |
| if [ ! -f Gemfile ]; then | |
| echo 'No `Gemfile` found! Aborting' | |
| exit 1 | |
| fi |