A03: Git/Webstorm/Github/Tutorial

Part 1: Directions on Using JetBrains Webstorm

Step 1: Accessing Webstorm:

1. From the Academic Licensing page select 'Apply Now' under the 'For Students and Teachers Tab.
2. You will be see a form requesting your personal and university information. Where it says 'Apply With' select 'Offical Document.'
3. Fill out the required information as a Student and upload a file with your student ID.
4. Accept the JetBrains Agreement and select 'Apply for free Products'

Once submitted, you will receive an email confirming access to JetBrains products in a few days.

Step 2: Create a New Empty Project

• Project - folder with editable source code

1. From the main screen,or from the toolbar at the top of your Webstorm application, select File > New > Project >
2. Choose 'Empty Project' from the new menu window that pops up. Specify the folder path and click 'Create'

Step:3 Open a Project

From the main screen, or from the toolbar at the top of your Webstorm application, select 'Open' then select the source folder of your choosing.

• Within the Summary field on the lower left, type initial commit. Click commit to master. The files will disappear and the screen will update. Click the blue Push origin button near the upper right. The initial commit of the game project is now completed.

Step 4: Opening a Project from GitHub

1. Select Git from the toolbar at the top of the Webstorm application
2. From the menu that appears, select 'Clone..'
3. You will be presented with the 'Get From Version Control' menu, with the 'Repository URL' already selected. From here you can paste the link to your GitHub repository and then select Clone.
   • Alternatively, you can select the 'GitHub' from the side-menu where you will be prompted to enter your login information. Once logged-in you will be able to select from existing repositories in your GitHub.

Step 5: Additional

Once the focus of the branch is completed, a pull request must be created to merge all of the changes. GitHub and GitHub desktop allows to restore from the change history in the even of a merge conflict.

Part 2: Glossary

- Define Terms

Branch

• A new/separate version of the main repository

Clone

• a full copy of a repository

Commit

• is an individual change to a file. When you make a commit to save your work, Git creates a unique ID that allows you to keep record of the specific changes committed along with who made them and when.

Fetch

• Gets all the change history of a tracked repository

GIT

• Git is a version control system designed to manage the teamwork done on a project. Git helps the contributors to track the changes in files or projects and speed up the overall process.

Github

• GitHub, is an Internet hosting service for software development and version control using Git. It provides the distributed version control of Git plus access control, bug tracking, software feature requests, task management, continuous integration, and wikis for every project. Headquartered in California, it has been a subsidiary of Microsoft since 2018.

Merge

• Combines two branches

Merge Conflict

• When merging branches fails

Push

• Sync local changes to remote

Pull

• Sync remote changes to local
• Combines merge and fetch commands

Remote

• In the context of this course, remote refers to internet hosted
  • Example: GitHub hosts our remote repositories for this course

Repository

• Development workspace where GIT is initialized, containing folders and files

Resources

• https://www.toolsqa.com/git/git-tutorial/#:~:text=Git%20Tutorial%201%20Introduction%20Git%20is%20a%20version,8%20Interaction%20with%20Remote%20Repository%20...%20More%20items
• https://www.jetbrains.com/help/webstorm/getting-started-with-webstorm.html