Accessing Feature Branches

Leoreth

Bofurin
Retired Moderator
Joined
Aug 23, 2009
Messages
38,035
Location
風鈴高等学校
In the thread about my plans for 1.16 I mentioned that I would be working on all planned features in parallel in separate branches and only merge them once the feature is complete.

This is how that's going to work: I will maintain a separate thread for each feature branch in which I will post about updates just like in the main update log. There you can also leave your feedback when trying the branch. I'll try to keep those branches up to date with develop, but depending on what I am working on this may not always happen immediately. The only way to play with multiple feature branches combined will be to wait until they are both merged into develop.

Here is how you can access them with TortoiseGit:
- right-click the "RFC Dawn of Civilization" folder
- select "TortoiseGit" -> "Switch/Checkout"
- in the drop-down menu next to "Branch", select the desired branch name and confirm
- if the branch name does not exist, first do "TortoiseGit" -> "Fetch ..." and confirm
 
Last edited:
Another note: when I rebase a branch to the develop branch, your normal pull/sync may be rejected. In that case, run another "switch/checkout" and select both "force" and "override existing branch if exists".
 
Back
Top Bottom