X Xon Well-known member Aug 21, 2017 #1 Affected version XF2 DP10 My merge tool creates .bak files, and apparently if these are in the _output folder xf-dev:import will attempt to import them. Which obviously fails as they are a patch file with <<<<<<< HEAD and such.
My merge tool creates .bak files, and apparently if these are in the _output folder xf-dev:import will attempt to import them. Which obviously fails as they are a patch file with <<<<<<< HEAD and such.
Kier XenForo developer Staff member Sep 29, 2017 #2 Have now whitelisted valid extensions, so your .bak files shouldn't cause any further problems.
