

If you don’t merge from trunk every day, your branch will diverge, and the merge will become more costly, up to the point where the merge will be so different that scary, crazy, unpredictable bugs will happen. This is a lot like continuous integration. If something in a version actually ends up destroying something you really need, then it’s time to think about forking or other workarounds, but the default option should always be to accept upstream, and convert whatever you’re doing that’s not compatible with upstream changes. 1 update to the engine versions before you do this.) It’s worth it to plan for a few person days for each major engine version (and it’s OK to wait for the.

Every game has the siren call of just freezing a particular version, because “it causes less changes.”Īnd, everytime that happens, the game ends up having to pull extremely scary hacks and twisted logic to hide bugs that come up during development, but are fixed in later versions of upstream.
