Master Version Control – Branching, Merging, Collaboration
Keep adding new skills with 10,000+ programs for $239 (usually $399). Save now.
Master Version Control – Branching, Merging, Collaboration
This course is part of Complete Git Guide: Understand and Master Git and GitHub Specialization
Included with
Ask Coursera
Recommended experience
Recommended experience
What you'll learn
Master Git workflows including cloning, branching, and committing changes.
Handle complex merge conflicts and use both terminal and GitHub Desktop to resolve them.
Effectively manage repositories and collaborate through GitHub pull requests.
Fork repositories, sync upstream changes, and contribute to open-source projects.
Skills you'll gain
Details to know
See how employees at top companies are mastering in-demand skills
Build your subject-matter expertise
- Learn new concepts from industry experts
- Gain a foundational understanding of a subject or tool
- Develop job-relevant skills with hands-on projects
- Earn a shareable career certificate
There are 6 modules in this course
This course features Coursera Coach!
A smarter way to learn with interactive, real-time conversations that help you test your knowledge, challenge assumptions, and deepen your understanding as you progress through the course. Master version control with Git in this comprehensive course designed to make you proficient in Git workflows and collaboration techniques. By the end of this course, you'll be able to confidently manage version control, collaborate with team members, and navigate Git’s powerful branching and merging features. You’ll gain hands-on experience with Git commands, GitHub, and advanced tools like GitHub Desktop and SourceTree. The course begins by introducing cloning, exploring, and modifying remote repositories. It covers the essentials of committing changes, using the git diff command, and managing repository contents in GitHub and Visual Studio Code. As you move on, you'll dive into branch merging, starting with simple fast-forward merges and advancing to resolving merge conflicts, both through the terminal and in Visual Studio Code. Next, you'll explore GitHub’s role in collaborative development, how to push, fetch, and pull changes, and the process of creating and managing pull requests. The course also delves into forking repositories and contributing to open-source projects, including syncing changes from the upstream repository and submitting pull requests. You’ll also learn about configuring protected branch rules to enforce review policies for smooth collaboration. This course is ideal for software developers, engineers, and anyone looking to improve their version control and collaboration skills. Some experience with basic Git commands and GitHub is recommended, and the course caters to both intermediate learners and professionals.
In this module, we will cover the foundational steps of cloning and modifying public repositories. You will learn to clone a remote repository, explore its contents, and make changes. Additionally, we’ll dive into essential Git commands like git diff and commit techniques using GitHub Desktop and Visual Studio Code.
What's included
10 videos2 readings1 assignment
10 videos•Total 62 minutes
- Section 7 Introduction•1 minute
- Cloning a Remote Repository•6 minutes
- Exploring the Contents of the Cloned Repository•8 minutes
- Unpacking Git Objects•4 minutes
- Exploring a Cloned Repository in GitHub Desktop•5 minutes
- Installing the Text Editor Visual Studio Code•3 minutes
- Exploring Visual Studio Code•6 minutes
- Committing Changes in the Cloned Repository•12 minutes
- Git diff Command•14 minutes
- Overview of the Changes•4 minutes
2 readings•Total 20 minutes
- Introduction to the Course 'Master Version Control: Git, Branching, Merging, Collaboration'•10 minutes
- Full Specialization Resources•10 minutes
1 assignment•Total 15 minutes
- Cloning, Exploring, and Modifying Public Repositories - Assessment•15 minutes
In this module, we will explore the critical process of merging branches in Git. You will understand the different types of merges, including fast-forward and three-way merges, and learn how to handle merge conflicts. Additionally, we’ll guide you through using Git tools such as SourceTree to enhance your branching workflow.
What's included
15 videos1 assignment
15 videos•Total 85 minutes
- Section 8 Introduction•1 minute
- Why Branch Merging is Needed•3 minutes
- Fast-Forward Merge•4 minutes
- Merging Process•2 minutes
- Fast-Forward Merge in Action•7 minutes
- Three-Way Merge•6 minutes
- Performing a Three-Way Merge•13 minutes
- Observing a Git Repository after a Three-Way Merge•7 minutes
- Installing SourceTree•4 minutes
- SourceTree in Action•7 minutes
- What is a Merge Conflict?•3 minutes
- Creating a Merge Conflict•10 minutes
- Observing Conflicts in the Staging Area and Working Directory•7 minutes
- Resolving a Merge Conflict in Terminal•3 minutes
- Resolving Conflicts in Visual Studio Code•9 minutes
1 assignment•Total 15 minutes
- Merging Branches - Assessment•15 minutes
In this module, we will dive into GitHub, focusing on the creation, management, and collaboration features that remote repositories offer. You will learn how to set up a GitHub account, create repositories, and interact with branches and commits directly within the GitHub platform.
What's included
11 videos1 assignment
11 videos•Total 50 minutes
- Section 9 Introduction•1 minute
- What is a Git Hosting Service?•4 minutes
- Creating a GitHub Account•4 minutes
- Creating GitHub Personal Access Tokens•10 minutes
- Exploring the First Repository in GitHub•11 minutes
- Creating Another Commit in GitHub•3 minutes
- Creating a New Branch in GitHub•1 minute
- Making Changes in the New Branch•4 minutes
- Cloning a Remote Repository•5 minutes
- What is a Remote Repository?•3 minutes
- How a Remote Repository Empowers Collaboration•4 minutes
1 assignment•Total 15 minutes
- GitHub and Remote Repositories - Assessment•15 minutes
In this module, we will focus on the critical Git operations that help you stay in sync with your team’s changes: pushing, fetching, and pulling. You will also learn about tracking branches and how to manage your remote repository effectively to ensure smooth collaboration.
What's included
22 videos1 assignment
22 videos•Total 127 minutes
- Section 10 Introduction•2 minutes
- Overview of the Push, Fetch, and Pull Git Commands•6 minutes
- What is Origin?•4 minutes
- Listing Remote and Local Branches•3 minutes
- What is a Tracking Branch?•5 minutes
- Checking Out a Remote Branch•4 minutes
- Git Remote Show Origin•3 minutes
- Git Fetch in Action•6 minutes
- Git Pull Two-Step Process•4 minutes
- How to Perform Git Pull•5 minutes
- What is FETCH_HEAD?•8 minutes
- Git Pull with Fast-Forward Merge•8 minutes
- Fetching Remote Changes Manually•9 minutes
- Merging FETCH_HEAD Manually•6 minutes
- Resolving Conflicts Using Git Pull•12 minutes
- Pushing to a Remote Repository•9 minutes
- Committing Under Another Author•3 minutes
- How Remote and Local Branches Sync•4 minutes
- Creating a Remote Branch Based on a Local Branch•9 minutes
- Updating the Tracking Status of the Branches•8 minutes
- Removing a Remote Branch Using a Local Terminal•4 minutes
- Git Show-Ref•4 minutes
1 assignment•Total 15 minutes
- Git Push, Fetch, and Pull - Assessment•15 minutes
In this module, we will explore the process of using pull requests in GitHub to manage collaboration. You will learn how to create pull requests, request changes, and approve them, all while ensuring a smooth review process for your team. We will also discuss advanced settings like protected branches for added control.
What's included
22 videos1 assignment
22 videos•Total 117 minutes
- Section 11 Introduction•1 minute
- Collaboration Between Contributors•4 minutes
- What is a Pull Request?•3 minutes
- Why Was Pull Request Named Pull Request?•6 minutes
- Pull Request Versus Merge Request•5 minutes
- Pull Request Step-By-Step•8 minutes
- Creating a New Repository in GitHub•7 minutes
- Changing the Author of the Last Commit•3 minutes
- Pushing Branch to Remote•5 minutes
- Opening a Pull Request•8 minutes
- Adding Comments and Approving a Pull Request•9 minutes
- Creating and Publishing a New Branch Using GitHub Desktop•5 minutes
- Signing into GitHub Using GitHub Desktop•1 minute
- Creating and Merging a Pull Request•9 minutes
- Adding a New Collaborator in GitHub•4 minutes
- Exploring Your GitHub Account•5 minutes
- Opening and Merging a Pull Request Using a Collaborator•7 minutes
- Merging Without Approvals•2 minutes
- Configuring a Protected Branch Rule•4 minutes
- Merging After Gaining Required Approval•3 minutes
- Exploring Pull Requests in Public Repositories•6 minutes
- Working with Issues in GitHub•12 minutes
1 assignment•Total 15 minutes
- Pull Requests - Assessment•15 minutes
In this module, we will cover the concept of forking repositories and how it fosters collaboration in open-source development. You will learn to sync your fork with the parent repository, make contributions, and submit pull requests to contribute to public repositories effectively.
What's included
13 videos1 reading3 assignments
13 videos•Total 55 minutes
- Section 12 Introduction•1 minute
- Creating a Fork•5 minutes
- Syncing Changes from the Parent Repository•5 minutes
- Adding a New Upstream Remote Repository•2 minutes
- Fetching Changes from Upstream•2 minutes
- Synchronizing Changes from Upstream•11 minutes
- How to Open a Pull Request from a Forked Repository•3 minutes
- Creating a Pull Request from a Forked Repository•2 minutes
- Removing a Repository Collaborator•2 minutes
- Forking a Repository•3 minutes
- Committing Changes in a Forked Repository•3 minutes
- Opening a Pull Request from a Forked Repository•5 minutes
- Approving and Merging a Pull Request from a Forked Repository•12 minutes
1 reading•Total 10 minutes
- Conclusion to the Course 'Master Version Control: Git, Branching, Merging, Collaboration'•10 minutes
3 assignments•Total 90 minutes
- Full Course Practice Assessment•15 minutes
- Forks and Contribution to Public Repositories - Assessment•15 minutes
- Full Course Assessment•60 minutes
Earn a career certificate
Add this credential to your LinkedIn profile, resume, or CV. Share it on social media and in your performance review.
Instructor
Explore more from Software Development
- Status: Free Trial
Specialization
- Status: Free Trial
Specialization
Course
Why people choose Coursera for their career
Frequently asked questions
Yes, you can preview the first video and view the syllabus before you enroll. You must purchase the course to access content not included in the preview.
If you decide to enroll in the course before the session start date, you will have access to all of the lecture videos and readings for the course. You’ll be able to submit assignments once the session starts.
Once you enroll and your session begins, you will have access to all videos and other resources, including reading items and the course discussion forum. You’ll be able to view and submit practice assessments, and complete required graded assignments to earn a grade and a Course Certificate.
More questions
Financial aid available,