Welcome to the Git Workshops repository! This repository contains all the materials used in the workshops and is set up to allow students to fork and practice by making commits and branches.
These workshops were designed to introduce the basics of Git and GitHub and provide a deeper understanding of Git branching and merging. Participants engaged in hands-on activities by forking this repository, making commits, and practicing branch workflows.
Focus:
- Git Basics
- Git Branching and Merging
Topics covered:
- Introduction to version control
- Installing Git and initial setup
- Basic Git commands (clone, commit, push, pull)
- Branching, merging, and pull requests
- Detailed explanation of branches
- Merging strategies (fast-forward, 3-way merge)
- Resolving merge conflicts
- Collaboration using GitHub
The workshops utilized the following video tutorials:
-
Git Basics: Git Tutorial for Beginners: Learn Git in 1 Hour
By Mosh Hamedani
Watch here -
Git Branching and Merging - Detailed Tutorial
By SuperSimpleDev
Watch here
You can access the slides for both workshops here:
This repository is also designed for hands-on Git training. Here's how you can use it:
-
Fork this Repository
Click the "Fork" button on GitHub to create a copy of this repository in your own GitHub account. -
Clone the Forked Repository
In your terminal, clone the forked repo to your local machine:git clone https://github.com/YOUR-USERNAME/git-workshop.git
-
Create a New Branch
Create a new branch for making changes:git checkout -b your-branch-name
-
Make Your Changes
Modify files or add new files to the repository, and commit your changes:git add . git commit -m "Your message"
-
Push Your Changes
Push your branch back to GitHub:git push origin your-branch-name
-
Open a Pull Request
On GitHub, open a pull request from your branch to this repository'smain
branch to complete the training process.
Feel free to experiment and practice with commits, branches, and merges!
If you have any questions or need further guidance while working with Git or this repository, don’t hesitate to reach out!
You can contact me via email