Week 1¶
Chatgpt was used for the definitions used here and google for the images.
Applications¶
**Git **¶
Repository (Repo): A project or directory that Git is tracking. It can be local (on your computer) or remote (hosted on platforms like GitHub or GitLab).
Commit: A snapshot of your project at a specific point in time. Every time you save changes, you create a commit that records those changes.
Branch: A separate line of development. It allows you to work on different features or fixes without affecting the main codebase. The main branch is often called master or main.
Merge: The process of integrating changes from one branch into another. For example, merging a feature branch into the main branch.
Clone: Making a local copy of a remote repository to your local machine.
Push: Uploading your commits from your local repository to a remote repository (like GitHub).
Pull: Fetching and integrating changes from a remote repository into your local repository.
Fetch: Downloading new data from a remote repository without merging it into your current branch. It’s like checking if there are any changes in the remote repo but not applying them yet.
Pull Request (PR): A request to merge changes from one branch into another, typically used in collaborative workflows (especially on platforms like GitHub).
Conflict: Occurs when two branches have changes in the same part of a file and Git can’t automatically merge them. You’ll need to manually resolve these conflicts.
Staging Area (Index): A place where changes go before they are committed. You can selectively stage files or parts of files.
Checkout: Switching between branches or revisiting previous commits. You can use git checkout
Remote: A version of the repository hosted on a server (e.g., GitHub, GitLab). It’s often referenced as origin.
HEAD: A pointer to the current commit you are working on. HEAD typically points to the latest commit in the current branch.
Diff: A comparison between changes made. Git allows you to see the difference between versions of files.
Log: A history of commits in your repository. You can view it with git log to track changes.
**GitLab **¶
We can transport our local repositary from here.
GitBash¶
Used for making a ssh key and saving any changes
** vs code**¶
The place we write our site and edit it.(uses markdown language)
** flameshot**¶
Helps with taking screenshots
** Xnconvert**¶
Lessens the storage of the image file
** Command prompt**¶
Easier to navigate to your file and save changes(I usually use this)