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

[cstpsm]

@;125931

Hi

Very nice project. I watched it from beginn and finally made my first minor change. It’s to leave the build mode with right click. I hope that I can contribute much more in the future.

edit: Do i need to be added to the git rep to add something?

github name:
trello name :

Sounds like a useful addition

I’ve added you to the trello board, ryanjon can add you to the git repository and maybe even create your own branch.

Another general development question that I have is how do we properly merge branches and what happens when we have a conflict while auto merging and we have to do a manual merge? I have experiencr with normal source code files (java javascript etc) and manual merges (you get 1 file in which you can see common stuff and from where the files begin to differ)… How does that work with these unreal engine files?

And what is the desired process for merging changes to the master branch? As more and more people join in, we need to establish some kind of process to ensure we keep the quality up and don’t lose changes.