Tilman Vogel tvogel
tvogel
/ git-merge-associate
Created
March 30, 2011 13:23
git script to manually associate files in a conflicting merge when rename detection fails
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 | |
| # | |
| # Purpose: manually associate missed renames in merge conflicts | |
| # | |
| # Usage: git merge-associate <our-target> <base> <theirs> | |
| # | |
| # Example: After a failed rename detection A/a -> B/b which results | |
| # in CONFLICT (delete/modify) for A/a and corresponding "deleted by us" | |
| # messages in git status, the following invocation can be used to manually | |
| # establish the link: |