Reorganize Branches
wtfbbqhax opened this issue · comments
Now that I am performing merges from upstream ioquake3/ioq3, there is no reason to keep tracking master from darklegion/tremulous.
To Do
- Delete master
- Delete gpp
- Rename "blowfish-alpha-1" to "master"
- Rename "gpp-upstream-merge" to "upstream-merge"
- Update Travis configuration
Requirements
- Clean branch for upstream merges from ioq3 (gpp-upstream-merge)
- MUST NOT contain any changes from blowfish-alpha-1
- MUST NOT contain any whitespace changes
Once a clean copy of the upstream changes exist in the repo, integrate them into the project in the following manner
- Create a new branch based on "blowfish-alpha-1"
- Merge "gpp-upstream-merge" into the new branch
- Wait for Travis Successful build status
- Build test binaries
- Verify on OSX, Windows basic functionality. (Start server, join server, map loads, opengl1 and opengl2, etc..)
Squash blowfish-alpha-1 before rename to master
This is Fixed.