| commit | bd6dbdf3c7b9784fbf5d8500e427a954e27a976a | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Thu Aug 04 00:17:42 2005 -0400 |
| committer | Len Brown <len.brown@intel.com> | Thu Aug 04 00:17:42 2005 -0400 |
| tree | 9e626720517f1a0e92561b191e20640ed0af6362 | |
| parent | aefdcfa6c243702f1d35d23515d0e5eeca225c97 [diff] | |
| parent | d4ab025b73a2d10548e17765eb76f3b7351dc611 [diff] |
When a merge does not work automatically, git prevents commit from running until a change has been made in the destination. In this instance the desired result was to choose the destination version of the file and ignore the source version, but git would not allow that. Here I added a blank line to let git commit think I resolved a merge conflict.