Handle add-add conflicts just like both-modified.
GitBridge tracks paths and reasons for conflict.
Adapt the change in method signature.
Right, don't overwrite the imported `path`.
Merge pull request #55 from smashwilson/add-add-conflicts

Add-add conflicts