Assignment 3
Part 1 Git- Git is a system that allows you to track changes over a set of files. The first thing you need to do when using git is to create a Repository. Whenever you make changes to your files, you make a commit. Commits allow you to go back to older versions of your files. You can also create an Alternate branches that doesn't affect the main commits until you choose to merge the branch back unto the original.
GitHub- Github is a Website that hosts Git Projects. To use Github you first need to the GitHub Desktop app. From the app you can create a repository and open it in your text editor or IDE. Any files or changes that you make in the text editor will need to be committed to the master branch. After you make a committed you can push that change to Github which will make the remote version available on the Github website.
Webstorm- Webstorm is an IDE(Integrated Development Environment) that is mainly used for HTML, CSS and JavaScript development. After you down the app, you need to create a folder to store your files in. Then you need to select new file which will provide you with a list of the supported filetypes or you can choose to create a file on your own. After you are done with your file you can choose to run and debug your file. Part 2 Branch- A branch is a parallel version of a repository. It is contained within the repository, but does not affect the primary or master branch allowing you to work freely without disrupting the "live" version. When you've made the changes you want to make, you can merge your branch back into the master branch to publish your changes.
Clone- A clone is 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. When you make a clone, you can edit the files in your preferred editor and use Git to keep track of your changes without having to be online. The repository you cloned is still connected to the remote version so that you can push your local changes to the remote to keep them synced when you're online.
Commit- A commit, or "revision", is an individual change to a file (or set of files). When you make a commit to save your work, Git creates a unique ID (a.k.a. the "SHA" or "hash") that allows you to keep record of the specific changes commited along with who made them and when. Commits usually contain a commit message which is a brief description of what changes were made.
Fetch- When you use git fetch, you're adding changes from the remote repository to your local working branch without committing them. Unlike git pull, fetching allows you to review changes before committing them to your local branch.
GIT- Git is an open source program for tracking changes in text files. It was written by the author of the Linux operating system, and is the core technology that GitHub, the social and user interface, is built on top of.
Github- GitHub is a Git repository hosting service, but it adds many of its own features. While Git is a command line tool, GitHub provides a Web-based graphical interface. It also provides access control and several collaboration features, such as a wikis and basic task management tools for every project.
Merge-Merging takes the changes from one branch (in the same repository or from a fork), and applies them into another. This often happens as a "pull request" (which can be thought of as a request to merge), or via the command line. A merge can be done through a pull request via the GitHub.com web interface if there are no conflicting changes, or can always be done via the command line.
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. The merge conflict must be resolved before you can merge the branches.
Push- Pull refers to when you are fetching in changes and merging them. For instance, if someone has edited the remote file you're both working on, you'll want to pull in those changes to your local copy so that it's up to date. See also fetch.
Pull- To push means to send your committed changes to a remote repository on GitHub.com. For instance, if you change something locally, you can push those changes so that others may access 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- A repository is the most basic element of GitHub. They're easiest to imagine as a project's folder. A 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.
Reference list -https://techcrunch.com/2012/07/14/what-exactly-is-github-anyway/
-https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/github-glossary