Eduard Malakhov eduard-malakhov
eduard-malakhov
/ merge_versioned_json.sh
Last active
April 28, 2020 05:48
Git merge driver for versioned JSON files that attempts to automatically resolve version conflicts across branches
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
| #!/bin/bash | |
| # This file attempts to implement a merge strategy for "versioned" JSON files like package.json. | |
| # To use it as a git merge driver in a repository or globally, first set up the driver using | |
| # | |
| # git config merge.versioned-json.driver $(realpath merge_versioned_json.sh) | |
| # | |
| # or | |
| # | |
| # git config --global merge.versioned-json.driver $(realpath merge_versioned_json.sh) |