Git Workflow - Alteredux/XR GitHub Wiki

To manage branches and releases, we are using a well established workflow called Gitflow. This allows us to do frequent releases and get continuous feedback.

See https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

Since the Alteredux dev team does not use Git, we are making a slight alteration to Gitflow: beside the master and develop branches, there is also the alteredux branch. This branch will be used whenever the Alteredux dev team ships us a release in zip format. Here is the procedure to merge those releases:

1. Checkout alteredux branch
2. Delete all folders and files but these:
   • .git folder
   • .gitlab folder
   • .gitignore file
   • .gitattributes file
3. Unzip the release in the root folder of the project
4. Commit changes
5. Merge master branch into alteredux
6. Test and fix potential errors
7. Merge alteredux branch into master
8. Merge master branch into develop