Search Results for "usb-1.02-driver-hardlock"

...Simply adding files can lead to merge conflicts that have to be solved manually, although it would be possible to resolve the conflict automatically if the merge algorithm would be aware of the structure of Xcode's project file. After long and annoying merge sessions in one of my projects, I came to the conclusion, that writing a merge driver for git which understands the structure of the project file would be a worthwhile endeavour, as it would save me from solving the merge conflicts for my co-workers. Unfortunately, that script was finished only after the project ended. However, as I didn't want to let the work go to waste, this script is now published as open source under the GNU GPL 3. ...