Git Workflow and Collaboration Fundamentals
Master essential Git workflows, branching strategies, and collaboration techniques used in modern development teams.
- Git installed
- Basic command line knowledge
- GitHub account (optional)
- Understand core Git concepts and workflow
- Create and manage branches effectively
- Resolve merge conflicts confidently
- Collaborate using pull requests and code reviews
Initialize Your First Repository
Set up a new Git repository and understand the basic structure.
Create Your First Commits
Learn the staging area concept and create meaningful commits.
Master Branching and Switching
Create feature branches and switch between them to work on multiple tasks.
Merge Branches and Handle Conflicts
Merge feature branches back to main and learn to resolve conflicts.
Explore and Understand Git History
Use Git commands to explore project history and understand changes.
Undo Changes Safely
Learn safe ways to undo changes at different stages.
Collaborate with Remote Repositories
Learn to work with remote repositories and collaborate with others.
Found an issue?
More exercises
Linux
Creating and Connecting to Your First Linux Server
Spin up an Ubuntu 24.04 Linux server in the cloud, configure SSH key authentication, and learn to navigate your new server. This exercise uses DigitalOcean but the steps work with any cloud provider.
30 minutes
Terraform
Deploy a DigitalOcean Droplet with Terraform
Learn Infrastructure as Code basics by deploying a simple web server on DigitalOcean using Terraform. Perfect for beginners starting their IaC journey.
60 minutes
Linux
Securing Your Linux Server: Essential First Steps
Harden a fresh Ubuntu 24.04 server by creating a non-root user, locking down SSH, configuring a firewall with UFW, and setting up fail2ban to block brute-force attacks.
45 minutes
Also worth your time on this topic
How to Create a Remote Git Branch
Need to create a branch on the remote repository? Learn how to push local branches to remote and create remote branches directly.
Git Rebase vs Merge
What is the difference between git rebase and git merge? When would you use each?
junior
Creating and Connecting to Your First Linux Server
Spin up an Ubuntu 24.04 Linux server in the cloud, configure SSH key authentication, and learn to navigate your new server. This exercise uses DigitalOcean but the steps work with any cloud provider.
30 minutes