how can DD be a conflict, we both deleted the file, how can be that difficult to resolve? Jan 29, 2016 Back to all twitts