A02 - Git/GitHub/WebStorm Tutorial

Directions

1. Install Git from https://git-scm.com/downloads

2. Install WebStorm from https://www.jetbrains.com/student/

3. (Optional) Install GitHub Desktop from https://desktop.github.com/

4. Go to https://github.com and sign up with NJIT email. Use UCID as username.

5. On GitHub make a repository called A02. Add README.md. Copy the URL.

6. Open WebStorm. Go to Get from VCS. Paste URL. Clone it.

7. Make a file (example index.html). Stage it. Commit it. Push it. Example commit messages:

   • Task: Create Repository
   • Feature: added workflow for using github
   • Fix: changed readme.md for definition of terms

8. Make a new branch called feature/glossary. Edit README.md. Commit. Push. Make pull request on GitHub. If merge conflict happens, fix it in WebStorm, commit, push. Fetch and pull to update.

9. Final check: Repo is A02. README has tutorial and glossary. Commit messages correct. Repo is public.

Glossary

• Branch – separate line of work
• Clone – local copy of a repository
• Commit – save changes with message
• Fetch – get changes from remote without merging
• Git – version control system
• GitHub – site for repositories
• Merge – combine a branch into another
• Merge Conflict – when Git cannot merge automatically
• Push – send commits to remote repository
• Pull – fetch and merge from remote
• Remote – a repository online (like GitHub)
• Repository – project tracked by Git

References

• Git docs: https://git-scm.com/doc
• GitHub docs: https://docs.github.com/
• WebStorm docs: https://www.jetbrains.com/help/webstorm/
• Hendela, A. (2020). Extra Installation Instructions. NJIT.
• Hendela, A. (2019). Intro to GitHub and WebStorm. NJIT IS117 slides