As additional note, I try to keep all my GameWorks commits clearly separate for individual techs if the change is beyond fixing something less important, like UBT warnings. I also prefer keeping each initial merge squashed into single commit. There are few core reasons why I prefer approach:
-
it’s easier to upgrade specific individual tech for the next UE4 version as you have all needed things as separate commits with clear indication on what is from original merge and what was changed to make it compatible in case it was ported from earlier engine version. Nvidia usually does it like .
-
you can cherry-pick individual techs and fixes easily if you don’t want to merge all techs, you only need to have same major engine version (like 4.19.x) and it should be trivial to cherry-pick things without that many conflicts. Had these been in one big commit, it would be way harder for me to separate what was needed to change.
-
when the original tech branch merge is squashed into single commit, you can easily examine everything that individual tech/commit includes (through github, gitk, or your preferred git client) as it’s not yet mixed with other commits. Of course once there are bugfixes or changes after the merge has been done, those will have to be done in separate commits, so what I said only applies for the initial tech merge for the next major engine version.