Engine C++ code-base update

I wonder why, each time there is a new update, one needs to re-download those 2 supplementary packages from GitHub?I mean,I just have upgraded my editor to 4.0.2.When I launched and selected C++ based project,there was warning “You don’t have VS2013 installed” -which was wrong as I do have.So I guessed I had to update my C++ codebase as well.So I pulled from upstream (epic repo) and it gave me tons of merge conflicts(even though I did no changes to any part of C++ source code).To resolve all those would be a nightmare…I removed the old repo completely,set a new one and re-downloaded the supplementary archives.All this is a way too messy… Why you guys couldn’t have it all in a single repo?Also,it would be nice if you could give a sample of gitignore so we can know what stuff can be left outside of GIT sync,because as I said there was too much project generated stuff which caused conflicts with the new files.Thanks.