A03

Part 1: Directions on how to use Webstorm

1. Download Webstorm from this link: https://www.jetbrains.com/student/
2. Create github account: https://github.com/join
3. Connect Github with Webstorm ( press (Crtl+Alt+S) for Webstorm's System perferences, select version control Git. Enter the path to the git.exe)
4. Add Github Password to Webstorm ( while in the system preferences still select appearance and behavior| system settings | Passwords
5. Create a Respository from Webstorm (Select VCS and Import into Version Control)
6. Import a Repository from Github (From Main page Select Checkout from version control -> Git OR, From within Webstorm Select VCS -> Checkout from version control -> Git, Enter Github repository name, Enter local path name
7. Creating a Webstorm File (Choose File -> HTML -> HTML 5 or File -> Stylesheet
8. Add files to Git ( The Add to Git dialog opens. Click Add. This adds to local file system )

References: Intro to GitHub and Webstorm Powerpoint

Part 2: Glossary

Branch: a parallel version of a repository. It is contained with the repository, but does not affect the primary to main branch allowing you to work freely without disrupting the “live” version.

Clone: a copy of a repository that lives on your computer instead of on a website’s server somewhere, or the act of making that copy.

Commit: an individual change to a file ( or sets of files).

Fetch: adding changes from the remote repository to your local working branch without committing them.

GIT: An open source program for tracking changes in text files.

Github: a code hosting platform for version controls and collaboration. It lets you and others work together on projects from anywhere

Merge: takes the changes from one branch ( in the same repository or from a fork), and applies them into another.

Merge Conflict: A difference that occurs between merged branches. Merge conflicts happen when people make different changes to the same line of the same file, or when one person edits a file and another person deletes the same file.

Push: to send your committed changes to a remote repository on GitHub.com

Pull: refers to when you are fetching in changes and merging them.

Remote: This is the version of a repository or branch that is hosted on a server, most likely GitHub.com. Remote versions can be connected to local clones so that changes can be synced.

Repository: contains all of the project files (including documentation), and stores each file’s revision history. Repositories can have multiple collaborators and can be either public or private

References:

https://docs.github.com/en/get-started/quickstart/github-glossary