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

[Thommie]

@;155342

When you do a merge, both branches are combined NOT overwritten. Also they consider the commit time of the branches to decide which change to keep and which to discard. I dont know how this is going to work in binary files. After all git is designed to work with text files

I expected that they would combine, but since almost all files (especially the ones related to the crashing BPs) got updated i figured it should work the same as my branch. I didn’t know about the keeping/discarding changes, thanks for explaining.