Git Going with Comparing, Branching and Merging from Udemy

What's inside

Learning objectives

Install git and related tools, specifically for comparing and merging
Compare (diff) between various parts within git (branches, commits, and more)
Create, manage, and delete branches

Merge branches and resolve conflicts
Rebase branches and resolve conflicts

Install git and related tools, specifically for comparing and merging
Compare (diff) between various parts within git (branches, commits, and more)
Create, manage, and delete branches
Merge branches and resolve conflicts
Rebase branches and resolve conflicts

Syllabus

Students will learn about the purpose of this course

An overview of the topics covered in this course, including branching, merging, and resolving conflicts in Git.

All tools installed for this course

A guide to what software is going to be installed in this section for this course.

A guide to installing and setting up the source management tool Git for Windows.

A guide to installing the text editor Notepad++.

A guide to configuring Notepad++ to work better for this course.

A guide to installing the merge tool P4Merge.

A guide to configuring P4Merge on Windows.

An overview to the tools that will be installed in this section for this course.

A guide to getting the Apple provided version of the source control tool Git.

A guide to installing the text editor TextMate 2 on Mac OS.

A guide to configuring TextMate 2 to improve usability for the rest of this course.

A guide to installing the merge tool P4Merge on Mac OS.

A guide to configuring P4Merge on Mac OS.

Workspace setup and project repository on local system

Cloning the GitHub repository for this course onto your personal GitHub account and then downloading the repository onto your local system.

Various updates that might impact the course

GitHub recently changed the default branch name from "master" to "main" - which impacts the rest of this course.

Students will be able to compare differences in Git

Setting up our Git Repository in order to be able to do comparisons in later lessons.

Using P4Merge in order to compare our current GIt repository to the staged changes of our Git repository.

Comparing our current working directory in Git to the last commit on the Git repository.

Comparing our Git staging area to the last commit on the Git repository.

Limiting a comparison to a single file to focus in on what changes were made to just that file.

Comparing any arbitrary commit to another arbitrary commit in Git.

Comparing commits between our local Git repository and our remote GitHub repository, in order to help with pulling down changes that may conflict.

Pushing our changes up to GitHub now that we have verified the changes, as well as general cleanup for this section.

Students will be able to branch and merge in Git

An overview of the basic branching techniques that will be covered in this section by creating our first branch on Git that isn't our Master branch.

Merging branches in the easiest way possible, in which the changes can be smoothly integrated with no issues.

Disabling the easy path to merging in order to complicate the merge history when needed.

Creating a slightly more complicated merge, in which changes from both branches can automatically be integrated in with each other.

Resolving conflicts that arise when the same code is changed in two different branches in our Git repository.

Cleaning up what we have done in this section and pushing those changes back up to our remote GitHub repository.

Students will be able to perform standard rebases in Git

A guide to basic rebaseing within Git, in which we will take two branches with different changes to create a cohesive linear commit history.

Setting up a conflict that will make our rebase process a bit more complex.

Aborting a Git rebase in case that isn't what is wanted.

Resolving merge conflicts in order to allow our rebase to continue.

Rebasing our local repository with our remote repository in order to create a linear history path between the two.

Cleaning up our repository after we are finished rebasing and pushing up those changes to our remote GitHub repository.

Various updates, notes and errata is published here.

A guide to resolving the issue of Git not working after upgrading to a new version of Mac OS.

Review and final thoughts

An review of the topics we covered in this course, including branching, merging, and resolving conflicts in Git.

Bonus: Exclusive Student Discounts

Good to know

Know what's good

, what to watch for

, and possible dealbreakers

Teaches Git's comparing, branching, merging, and rebasing—core skills needed for collaborating with others

Strong focus on technical skills needed for working with Git, which is essential for software development

Suitable for students with beginner to intermediate experience with Git, but prior coding experience is recommended

Led by experienced instructors with expertise in software development, including Git

Provides a mix of presentations, screencasts, and hands-on labs for a more engaging learning experience

Course is part of a series on Git, indicating a comprehensive approach to the topic

Reviews summary

Well paced course for git users

Learners say this course is well paced and effective at taking them from beginner to an understanding of key concepts of Git. Though some of the training materials are Mac-centric, the course is largely accessible to Linux users as well.

Effective for Git Beginners

"I thought the course was well paced and got from me from a git user of only a few commands to understanding a few of the concepts"

"Although I think it would be a very dry subject, I'd like to understand how it all works under-the-covers now."

"Good course :-)"

Mac Focused Materials

"The course is MAC focused but its not a huge challenge to do everything from Linux, but a bit of help with vimdiff would be good.... (there are heaps of guides online of course).."

Activities

Be better prepared before your course. Deepen your understanding during and after it. Supplement your coursework and achieve mastery of the topics covered in Git Going with Comparing, Branching and Merging with these activities:

Compile and review course materials on Git branching and merging

Show steps

This activity will help you review and reinforce the concepts of Git branching and merging by compiling and reviewing your course materials.

Show steps

Gather your course materials on Git branching and merging
Review the materials
Summarize the key concepts

Follow a guided tutorial on Git branching and merging

Show steps

This activity will help you learn the basics of Git branching and merging through a guided tutorial, which can be a great way to get started.

Show steps

Find a guided tutorial on Git branching and merging
Follow the steps in the tutorial
Try out the commands on your own

Practice branching and merging using Git commands

Show steps

This activity will help you practice the fundamental Git commands for branching and merging, which are essential skills for collaborating on software projects.

Show steps

Create a new Git repository
Create a new branch
Make some changes to the code on the new branch
Merge the changes back into the main branch
Resolve any merge conflicts that arise

One other activity

Expand to see all activities and additional details

Show all four activities

Attend a peer session on Git branching and merging

Show steps

This activity will help you learn from and collaborate with other students on Git branching and merging, which can be a great way to reinforce your understanding.

Show steps

Find a peer session on Git branching and merging
Attend the session
Participate in the discussion

Career center

Learners who complete Git Going with Comparing, Branching and Merging will develop knowledge and skills that may be useful to these careers:

Software Developer

Software Developers apply engineering principles to the design, development, deployment, and maintenance of software systems. This course on Git Going with Comparing, Branching and Merging provides a foundation in the fundamental skills needed for this role. Software Developers use Git to track changes to their code and collaborate with others, and this course provides hands-on experience with these essential tasks.

See salaries and explore the career path for Software Developer

Software Engineer

Software Engineers design, build, and manage computer software applications. This course on Git Going with Comparing, Branching and Merging provides a foundation in the fundamental skills needed for this role. Software Engineers use Git to track changes to their code and collaborate with others, and this course provides hands-on experience with these essential tasks.

See salaries and explore the career path for Software Engineer

Web Developer

Web Developers design and develop websites and web applications. This course on Git Going with Comparing, Branching and Merging provides a foundation in the fundamental skills needed for this role. Web Developers use Git to track changes to their code and collaborate with others, and this course provides hands-on experience with these essential tasks.

See salaries and explore the career path for Web Developer

Data Engineer

Data Engineers design, build, and maintain data pipelines and databases. This course on Git Going with Comparing, Branching and Merging provides a foundation in the fundamental skills needed for this role. Data Engineers use Git to track changes to their code and collaborate with others, and this course provides hands-on experience with these essential tasks.

See salaries and explore the career path for Data Engineer

DevOps Engineer

DevOps Engineers work to bridge the gap between software development and IT operations. This course on Git Going with Comparing, Branching and Merging provides a foundation in the fundamental skills needed for this role. DevOps Engineers use Git to track changes to their code and collaborate with others, and this course provides hands-on experience with these essential tasks.

See salaries and explore the career path for DevOps Engineer

Technical Writer

Technical Writers create and maintain technical documentation, such as user manuals, white papers, and training materials. This course on Git Going with Comparing, Branching and Merging may be useful for Technical Writers who need to track changes to their documentation and collaborate with others.

See salaries and explore the career path for Technical Writer

Systems Analyst

Systems Analysts design and implement computer systems. This course on Git Going with Comparing, Branching and Merging may be useful for Systems Analysts who need to track changes to their system designs and collaborate with others.

See salaries and explore the career path for Systems Analyst

Computer Support Specialist

Computer Support Specialists provide technical support to users of computer systems. This course on Git Going with Comparing, Branching and Merging may be useful for Computer Support Specialists who need to track changes to their support procedures and collaborate with others.

See salaries and explore the career path for Computer Support Specialist

Computer Programmer

Computer Programmers write and maintain computer programs. This course on Git Going with Comparing, Branching and Merging may be useful for Computer Programmers who need to track changes to their code and collaborate with others.

See salaries and explore the career path for Computer Programmer

Project Manager

Project Managers are responsible for planning, executing, and closing projects. This course on Git Going with Comparing, Branching and Merging may be useful for Project Managers who need to track changes to their project plans and collaborate with others.

See salaries and explore the career path for Project Manager

Quality Assurance Analyst

Quality Assurance Analysts test and evaluate software to ensure that it meets quality standards. This course on Git Going with Comparing, Branching and Merging may be useful for Quality Assurance Analysts who need to track changes to their test plans and collaborate with others.

See salaries and explore the career path for Quality Assurance Analyst

Database Administrator

Database Administrators design, implement, and maintain databases. This course on Git Going with Comparing, Branching and Merging may be useful for Database Administrators who need to track changes to their database designs and collaborate with others.

See salaries and explore the career path for Database Administrator

Network Administrator

Network Administrators design, implement, and maintain computer networks. This course on Git Going with Comparing, Branching and Merging may be useful for Network Administrators who need to track changes to their network designs and collaborate with others.

See salaries and explore the career path for Network Administrator

Information Security Analyst

Information Security Analysts protect computer systems from unauthorized access, use, disclosure, disruption, modification, or destruction. This course on Git Going with Comparing, Branching and Merging may be useful for Information Security Analysts who need to track changes to their security policies and collaborate with others.

See salaries and explore the career path for Information Security Analyst

Product Manager

Product Managers are responsible for the planning, development, and launch of new products. This course on Git Going with Comparing, Branching and Merging may be useful for Product Managers who need to track changes to their product requirements and collaborate with others.

See salaries and explore the career path for Product Manager

Reading list

We've selected seven books that we think will supplement your learning. Use these to develop background knowledge, enrich your coursework, and gain a deeper understanding of the topics covered in Git Going with Comparing, Branching and Merging.

Deep Focus (Engaging Culture)

Save

Concise guide to Git. It covers all the essential Git commands and concepts. It great resource for anyone who wants to learn the basics of Git.

Deep Focus: Film and Theology in Dialogue (Engaging...

Paperback

Deep Focus (Engaging Culture): Film and Theology in...

Kindle Edition

Version Control with Git

Save

Practical guide to using Git. It covers all the basics of Git, as well as more advanced topics such as branching, merging, and rebasing. This book great resource for anyone who wants to learn more about Git.

Version Control with Git: Powerful tools and...

Paperback

Version Control with Git

Save

Practical guide to using Git for version control. It covers all the basics of Git, including installation, configuration, branching, merging, and rebasing. It also covers more advanced topics, such as using Git with a team and using Git for more complex projects.

Version Control with Git

Kindle Edition

Git Pocket Guide

Save

Quick reference guide to Git. It covers all the basic Git commands, as well as more advanced topics such as branching, merging, and rebasing. This book great resource for anyone who wants to learn more about Git.

Git Pocket Guide: A Working Introduction

Kindle Edition

Pragmatic Unit Testing in Java 8 with JUnit

Save

Pragmatic Unit Testing in Java 8 with JUnit

Kindle Edition

Debugging Teams

Save

Guide to using Git for software developers. It covers all the basics of Git, as well as more advanced topics such as branching, merging, and rebasing. This book great resource for anyone who wants to learn more about Git.

Debugging Teams: Better Productivity through...

Kindle Edition

Pro Git

Save

Guide to using Git for everyone. It covers all the basics of Git, as well as more advanced topics such as branching, merging, and rebasing. This book great resource for anyone who wants to learn more about Git.