[Community Project] Real Time Strategy Game. NEW MODELS AVAILABLE. SEE POST #1

[mindfane]

@;121196

Tried merging Brennen1350’s pull request and had a conflict with Test_Map.uasset. But lol…I dont know what i did (some commands via Git Powershell) but now i have his new Static Meshes on my PC.

EDIT: After merging, it removed all my newly created AI Blueprints. :mad:

Did you commit your local changes and pushed them to server before the merging?