Page History

...

1. Verifies connection to GIT Repository. 
2. The user is prompted to select the branch to close. The user can close a branch and discard all changes or close and merge the branch into another branch. The user will choose a branch to switch or merge to. 
   
3. If the user selects to close and merge, then a GIT merge action will take place between the selected branches. If there are any issues with this conflicts found during the merge, the user will receive a prompt to either discontinue progress on the script, or to view the conflicts: 
   Image Added
   1. If the user cancels, the script will be exited.  
   2. If the users chooses to review the conflicts they will be prompted with a list of the
   files creating issues. 
   1. conflicted files and the conflicts highlighted within them.
      Image Added
      
   2. It will then be up to the user to resolve the conflicts before trying to the Merge & Close again. 
4. The WhereScape app is closed.
5. The local GIT repository is refreshed from the selected branch on the remote GIT repository. 
6. WhereScape 3D is rebuilt using the files within the local GIT repository. 
7. WhereScape RED (if using) is rebuilt using the files within the local GIT repository. 
8. WhereScape 3D is reopened. 

...