Merge Tool does not supply all files

[Reese Leysen]

I just tried merging my month old network code with the latest and at first this seemed to work but when I finished making all code changes and then did a new check with the Merge tool, a bunch of new conflicts showed up. Seems that the Merge tool works in steps: if your code is too old, you have to merge with a specific version first and then with the latest. So it seems that at this last step I had to go through the conflicts again to merge with the latest version... Only now, the 'conflicts' listed a bunch of files that I didn't have in my code and the Merge tool didn't supply them in the 'ning' code either.

These are the missing files:

widgets\admin\templates\index\showMessages.php
widgets\forum\templates\category\edit.php
widgets\forum\templates\topic\listEmptyWithAddButton.php
widgets\index\templates\promotion\icon.php
widgets\photo\lib\helpers\Photo_TagHelper.php
widgets\video\lib\helpers\Video_TagHelper.php
xn_resources\widgets\forum\js\category\CategoryEditor.js
xn_resources\widgets\forum\js\category\edit.js
xn_resources\widgets\html\gfx\clearspring.png
xn_resources\widgets\html\gfx\yourminis.png
xn_resources\widgets\index\gfx\ning\xg_body.png
xn_resources\widgets\index\gfx\ning\xg_footer.png
xn_resources\widgets\index\gfx\ning\xg_module.png
xn_resources\widgets\index\js\BulkActionLink.js
xn_resources\widgets\index\js\actionicons\ActionButton.js
xn_resources\widgets\index\js\actionicons\PromotionButtion.js
xn_resources\widgets\index\js\actionicons\PromotionLink.js
xn_resources\widgets\index\js\dom.js
xn_resources\widgets\page\js\page\PageEditor.js
xn_resources\widgets\shared\js\ActionTabs.js
xn_resources\widgets\shared\js\NonParseableContainer.js
xn_resources\widgets\video\js\video\showFullScreen.js

[Reese Leysen]

Alright, doing that now!