Brushing up on source control

Introduction

This week I had to re-familiarize myself with the intricacies of source control, specifically Bit Bucket. Merge conflicts are a serious blocker for development and ended up using almost all my time for that week on the project. To top the week off the weapon statistics set method has no access to the project.

Goals

• Familiarize myself with Source Control
• Solve the merge conflicts.

Personnel

In this section, list the primary author of the spike report, as well as any personnel who assisted in completing the work.

Technologies, Tools, and Resources used

Provide resource information for team members who wish to learn additional information from this spike.

• https://docs.unrealengine.com/latest/INT/Platforms/VR/https://betterexplained.com/articles/a-visual-guide-to-version-control/
• https://www.lynda.com/GitHub-tutorials/Version-Control-Everyone/378045-2.html?org=usc.edu.au

Tasks undertaken

• A large amount of trial and error was involved in the process of this task. SourceTree can be very daunting to users unfamiliar with the process.
• At times I would seek the advice of someone more experienced to understand the procedures used for the project.

What we found out

• When using Source control, you can “checkout” certain branches which makes them available for viewing during the development process.
• Switching between branches will switch out the files within the current repository to that of the currently viewed branch.
• If you want to copy work from one branch to another, you can manually copy the files from a branch to your local computer. Then switch branches and bring the copied files to that working folder.

Recommendations

Before working with source control spend some time on a personal project familiarizing with SourceTree or whichever program you’re using for the project. This will minimize the risk of you damaging the project in later stages of development.