Purpose
Explains how to create a .unitypackage to upgrade the code in use by production.
Applicability
This article is applicable to Developers using the D6.0.1+ code.
Video
https://youtu.be/MBKB_a8byiI
Notes
Before making a patch, I update the ‘production’ branch in git as follows:
First, I make sure the FrankenApp branch is where I want it.
Then:
git checkout production git pull # just in case someone else has changed production git merge --no-commit FrankenApp
By telling it not to commit, I am able to make sure that certain files don’t get changed on the branch. I would like people tracking the branch to be able to be confident that their game-specific changes aren’t going to be overwritten, and as such, I don’t want to include the following files in production:
– the level scenes
– the mission JSON files
– the dynamic variable JSON files
In short, anything that is “data”.
Likewise, I’d probably try to avoid including:
– menu scenes
– overwritten skins
– overwritten title images
Then there is dealing with conflicts — most of which happen to be from the sort of files I just mentioned, in which case, I’ll briefly look at the diff and take the version already in the production branch, so it remains unchanged.
(To grab the existing version, “git checkout –ours — FILENAME”)
A “git clean -if” might also be in order to delete stray files.