LimeSurvey/LimeSurvey — comment on commit 127b7251510e0275b0a42487ef2f043603b2da1b
File:  line 0
By TMSWhite:

Hmm.. another option might be to force Git to accept the new files as definitive rather than trying to do a merge and resolve conflicts. Is that possible?