Git Going with Comparing, Branching and Merging

  • Course provided by Udemy
  • Study type: Online
  • Starts: Anytime
  • Price: See latest price on Udemy
Udemy

Course Description

Git Going with Comparing, Branching and Merging

Are you sure how to compare between commits, branches or the three states of Git? Do merges cause you trouble? What is a rebase, anyway?

In this course, students will walk though comparing (diffs), branching, merging and rebasing in Git. At the end of this course, students will have a firm understanding and experience with those paricular aspects of Git. Note: This is not a comprehensive course on Git -- we focus exclusively on comparing, branching, merging, and rebasing.

Recent Course Updates

  • October 17: Added Updates and Errata section

Course Outline

Course Introduction and Overview provides an introduction to this course.

After the introduction, the first thing we do is Git Installation for both Windows and Mac. There are dedicated sections for Windows and Mac -- so students can jump directly to the lectures specifically designed for their system. After the installation process, we will download the example project repository from GitHub (clone) which we will use throughout the course.

After installation and downloading the example project, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories.

We give great attending to Branching and Merging in Git. We start off with the simple "happy path" and learn about "Fast-Forward" merges and how to control them. The we walk through common "automatic" merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool.

With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing. In that section, we cover several rebasing examples, including how to resolve a rebase conflict.

All tools have installation and configuration sections to ensure no one is left behind.

Course Features

Presentations provide audio/video training of conceptual ideas. Since few like slide-ware presentations, slide-presentations are kept to a minimum.

Screencasts provide a video of the instructor's computer system with any actions, commands, or screens displayed and narrated. There is nearly 2 hours of screencast based video training in order to step through each command or action in sufficient detail.

Special Notes

This course is part of the "Git Going" series and is included with the Git Complete comprehensive course. If you are already enrolled in that course, do not enroll in this course.

This course makes extensive use of the command line. Each command is discussed in detail, so everyone can follow along.

Who this course is for:

  • Anyone that needs learn about comparing, branching, merging and rebaseing within Git
  • Not for Git beginner (should be taken after intro course on Git)
  • Software engineers, developers, programmers on teams using branches

Instructor

Lead Software Engineer, Dev Trainer (19 courses,50k reviews)
  • 4.4 Instructor Rating
  • 70,403 Reviews
  • 485,847 Students
  • 19 Courses

With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems.

Expected Outcomes

  1. 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 Curated for the Udemy Business collection Course content 9 sections • 37 lectures • 2h 14m total length Expand all sections Introduction 1 lecture • 5min Course Introduction Preview 04:53 Windows Installation 6 lectures • 22min Installation Overview for Windows Preview 00:44 Git for Windows Preview 05:40 Notepad++ Install 02:08 Notepad++ Configuration 03:23 P4Merge for Windows Install 05:42 P4Merge for Windows Configuration 04:18 Mac OS X Installation 6 lectures • 14min Installation Overview for Mac OS X Preview 00:56 Apple Git on Mac OS X (Yosemite and above) Preview 01:11 TextMate 2 Install 03:09 TextMate 2 Configuration 03:06 P4Merge for Mac Install 01:57 P4Merge for Mac Configuration 04:07 Setup 1 lecture • 3min Course Project Repository Preview 03:08 Comparing in Git 8 lectures • 22min Git Repository Setup (for Comparing examples) 05:47 Comparing Working Directory and the Staging Area Preview 02:24 Comparing Working Directory and the Git Repository (Last Commit) 01:44 Comparing Between the Staging Area and the Git Repository (Last Commit) 01:38 Limiting Comparisons to one File (or Path) 01:54 Comparing Between Commits 04:32 Comparing Between Local and Remote Master Branches 02:00 Comparison Section Cleanup and Push back to GitHub 01:32 Branching and Merging in Git 6 lectures • 34min Branching Basics Preview 04:43 Happy Path / Fast Forward Merges 06:39 Happy Path / Disable Fast Forward Merges 04:07 Automatic Merges 05:25 Conflicting Merges and Resolution 11:35 Section Clean up and Push back to GitHub 01:32 Rebasing in Git 6 lectures • 24min Simple Rebase Example 08:16 Setup a Rebasing Conflict 02:45 Abort a Rebase 02:01 Rebase Conflict and Resolution 03:59 Pull with Rebase (GitHub) 04:45 Section Cleanup and Push to GitHub 01:48 Updates and Errata 1 lecture • 5min Git Mac OS X Updates 05:07 Conclusion 2 lectures • 6min Review 01:19 Bonus: Exclusive Student Discounts 04:49 Requirements Basic Computer Skills Ability to install software on your system Admin rights may be required for software installation Basic understanding of Git source control (add, commit, push and pull) Description Git Going with Comparing, Branching and Merging Are you sure how to compare between commits, branches or the three states of Git? Do merges cause you trouble? What is a rebase , anyway? In this course, students will walk though comparing (diffs), branching, merging and rebasing in Git. At the end of this course, students will have a firm understanding and experience with those paricular aspects of Git. Note: This is not a comprehensive course on Git -- we focus exclusively on comparing , branching , merging , and rebasing . Recent Course Updates October 17: Added Updates and Errata section Course Outline Course Introduction and Overview provides an introduction to this course. After the introduction, the first thing we do is Git Installation for both Windows and Mac. There are dedicated sections for Windows and Mac -- so students can jump directly to the lectures specifically designed for their system. After the installation process, we will download the example project repository from GitHub (clone) which we will use throughout the course. After installation and downloading the example project, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories. We give great attending to Branching and Merging in Git. We start off with the simple "happy path" and learn about "Fast-Forward" merges and how to control them. The we walk through common "automatic" merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool. With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing . In that section, we cover several rebasing examples, including how to resolve a rebase conflict. All tools have installation and configuration sections to ensure no one is left behind. Course Features Presentations provide audio/video training of conceptual ideas. Since few like slide-ware presentations, slide-presentations are kept to a minimum. Screencasts provide a video of the instructor's computer system with any actions, commands, or screens displayed and narrated. There is nearly 2 hours of screencast based video training in order to step through each command or action in sufficient detail. Special Notes This course is part of the "Git Going" series and is included with the Git Complete comprehensive course. If you are already enrolled in that course, do not enroll in this course. This course makes extensive use of the command line . Each command is discussed in detail, so everyone can follow along. Who this course is for: Anyone that needs learn about comparing, branching, merging and rebaseing within Git Not for Git beginner (should be taken after intro course on Git) Software engineers, developers, programmers on teams using branches Show more Show less Instructor Jason Taylor Lead Software Engineer, Dev Trainer (19 courses,50k reviews) 4.4 Instructor Rating 70,403 Reviews 485,847 Students 19 Courses With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems. Show more Show less Udemy Business Teach on Udemy Get the app About us Contact us Careers Blog Help and Support Affiliate Impressum Kontakt Terms Privacy policy Cookie settings Sitemap © 2021 Udemy, Inc. window.handleCSSToggleButtonClick = function (event) { var target = event.currentTarget; var cssToggleId = target && target.dataset && target.dataset.cssToggleId; var input = cssToggleId && document.getElementById(cssToggleId); if (input) { if (input.dataset.type === 'checkbox') { input.dataset.checked = input.dataset.checked ? '' : 'checked'; } else { input.dataset.checked = input.dataset.allowToggle && input.dataset.checked ? '' : 'checked'; var radios = document.querySelectorAll('[name="' + input.dataset.name + '"]'); for (var i = 0; i (function(){window['__CF$cv$params']={r:'6777a3909e7b06cd',m:'186dc0d9a74386222f8479b39e3979b3883476d8-1627743025-1800-AZXINl1vMZfF0pEThMV7QZVyfMeaA5e+rppgoZp1zVLIRj60W6/OzYvlmT9+2XFrCmV5uPVqMyIhq8LPokixk0GAylpGN1CLsVCEA2vwmZn1vcG+IRUfP1sqLHCOlTgs7gs65udcyBLQ54dWsYCxUrzLtVyF+PvYL/rMYoG2c5Rw',s:[0xacbc7005ad,0x3095472e65],}})();
  2. 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 Curated for the Udemy Business collection Course content 9 sections • 37 lectures • 2h 14m total length Expand all sections Introduction 1 lecture • 5min Course Introduction Preview 04:53 Windows Installation 6 lectures • 22min Installation Overview for Windows Preview 00:44 Git for Windows Preview 05:40 Notepad++ Install 02:08 Notepad++ Configuration 03:23 P4Merge for Windows Install 05:42 P4Merge for Windows Configuration 04:18 Mac OS X Installation 6 lectures • 14min Installation Overview for Mac OS X Preview 00:56 Apple Git on Mac OS X (Yosemite and above) Preview 01:11 TextMate 2 Install 03:09 TextMate 2 Configuration 03:06 P4Merge for Mac Install 01:57 P4Merge for Mac Configuration 04:07 Setup 1 lecture • 3min Course Project Repository Preview 03:08 Comparing in Git 8 lectures • 22min Git Repository Setup (for Comparing examples) 05:47 Comparing Working Directory and the Staging Area Preview 02:24 Comparing Working Directory and the Git Repository (Last Commit) 01:44 Comparing Between the Staging Area and the Git Repository (Last Commit) 01:38 Limiting Comparisons to one File (or Path) 01:54 Comparing Between Commits 04:32 Comparing Between Local and Remote Master Branches 02:00 Comparison Section Cleanup and Push back to GitHub 01:32 Branching and Merging in Git 6 lectures • 34min Branching Basics Preview 04:43 Happy Path / Fast Forward Merges 06:39 Happy Path / Disable Fast Forward Merges 04:07 Automatic Merges 05:25 Conflicting Merges and Resolution 11:35 Section Clean up and Push back to GitHub 01:32 Rebasing in Git 6 lectures • 24min Simple Rebase Example 08:16 Setup a Rebasing Conflict 02:45 Abort a Rebase 02:01 Rebase Conflict and Resolution 03:59 Pull with Rebase (GitHub) 04:45 Section Cleanup and Push to GitHub 01:48 Updates and Errata 1 lecture • 5min Git Mac OS X Updates 05:07 Conclusion 2 lectures • 6min Review 01:19 Bonus: Exclusive Student Discounts 04:49 Requirements Basic Computer Skills Ability to install software on your system Admin rights may be required for software installation Basic understanding of Git source control (add, commit, push and pull) Description Git Going with Comparing, Branching and Merging Are you sure how to compare between commits, branches or the three states of Git? Do merges cause you trouble? What is a rebase , anyway? In this course, students will walk though comparing (diffs), branching, merging and rebasing in Git. At the end of this course, students will have a firm understanding and experience with those paricular aspects of Git. Note: This is not a comprehensive course on Git -- we focus exclusively on comparing , branching , merging , and rebasing . Recent Course Updates October 17: Added Updates and Errata section Course Outline Course Introduction and Overview provides an introduction to this course. After the introduction, the first thing we do is Git Installation for both Windows and Mac. There are dedicated sections for Windows and Mac -- so students can jump directly to the lectures specifically designed for their system. After the installation process, we will download the example project repository from GitHub (clone) which we will use throughout the course. After installation and downloading the example project, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories. We give great attending to Branching and Merging in Git. We start off with the simple "happy path" and learn about "Fast-Forward" merges and how to control them. The we walk through common "automatic" merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool. With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing . In that section, we cover several rebasing examples, including how to resolve a rebase conflict. All tools have installation and configuration sections to ensure no one is left behind. Course Features Presentations provide audio/video training of conceptual ideas. Since few like slide-ware presentations, slide-presentations are kept to a minimum. Screencasts provide a video of the instructor's computer system with any actions, commands, or screens displayed and narrated. There is nearly 2 hours of screencast based video training in order to step through each command or action in sufficient detail. Special Notes This course is part of the "Git Going" series and is included with the Git Complete comprehensive course. If you are already enrolled in that course, do not enroll in this course. This course makes extensive use of the command line . Each command is discussed in detail, so everyone can follow along. Who this course is for: Anyone that needs learn about comparing, branching, merging and rebaseing within Git Not for Git beginner (should be taken after intro course on Git) Software engineers, developers, programmers on teams using branches Show more Show less Instructor Jason Taylor Lead Software Engineer, Dev Trainer (19 courses,50k reviews) 4.4 Instructor Rating 70,403 Reviews 485,847 Students 19 Courses With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems. Show more Show less Udemy Business Teach on Udemy Get the app About us Contact us Careers Blog Help and Support Affiliate Impressum Kontakt Terms Privacy policy Cookie settings Sitemap © 2021 Udemy, Inc. window.handleCSSToggleButtonClick = function (event) { var target = event.currentTarget; var cssToggleId = target && target.dataset && target.dataset.cssToggleId; var input = cssToggleId && document.getElementById(cssToggleId); if (input) { if (input.dataset.type === 'checkbox') { input.dataset.checked = input.dataset.checked ? '' : 'checked'; } else { input.dataset.checked = input.dataset.allowToggle && input.dataset.checked ? '' : 'checked'; var radios = document.querySelectorAll('[name="' + input.dataset.name + '"]'); for (var i = 0; i (function(){window['__CF$cv$params']={r:'6777a3909e7b06cd',m:'186dc0d9a74386222f8479b39e3979b3883476d8-1627743025-1800-AZXINl1vMZfF0pEThMV7QZVyfMeaA5e+rppgoZp1zVLIRj60W6/OzYvlmT9+2XFrCmV5uPVqMyIhq8LPokixk0GAylpGN1CLsVCEA2vwmZn1vcG+IRUfP1sqLHCOlTgs7gs65udcyBLQ54dWsYCxUrzLtVyF+PvYL/rMYoG2c5Rw',s:[0xacbc7005ad,0x3095472e65],}})();
  3. Create, manage, and delete branches Merge branches and resolve conflicts Rebase branches and resolve conflicts Curated for the Udemy Business collection Course content 9 sections • 37 lectures • 2h 14m total length Expand all sections Introduction 1 lecture • 5min Course Introduction Preview 04:53 Windows Installation 6 lectures • 22min Installation Overview for Windows Preview 00:44 Git for Windows Preview 05:40 Notepad++ Install 02:08 Notepad++ Configuration 03:23 P4Merge for Windows Install 05:42 P4Merge for Windows Configuration 04:18 Mac OS X Installation 6 lectures • 14min Installation Overview for Mac OS X Preview 00:56 Apple Git on Mac OS X (Yosemite and above) Preview 01:11 TextMate 2 Install 03:09 TextMate 2 Configuration 03:06 P4Merge for Mac Install 01:57 P4Merge for Mac Configuration 04:07 Setup 1 lecture • 3min Course Project Repository Preview 03:08 Comparing in Git 8 lectures • 22min Git Repository Setup (for Comparing examples) 05:47 Comparing Working Directory and the Staging Area Preview 02:24 Comparing Working Directory and the Git Repository (Last Commit) 01:44 Comparing Between the Staging Area and the Git Repository (Last Commit) 01:38 Limiting Comparisons to one File (or Path) 01:54 Comparing Between Commits 04:32 Comparing Between Local and Remote Master Branches 02:00 Comparison Section Cleanup and Push back to GitHub 01:32 Branching and Merging in Git 6 lectures • 34min Branching Basics Preview 04:43 Happy Path / Fast Forward Merges 06:39 Happy Path / Disable Fast Forward Merges 04:07 Automatic Merges 05:25 Conflicting Merges and Resolution 11:35 Section Clean up and Push back to GitHub 01:32 Rebasing in Git 6 lectures • 24min Simple Rebase Example 08:16 Setup a Rebasing Conflict 02:45 Abort a Rebase 02:01 Rebase Conflict and Resolution 03:59 Pull with Rebase (GitHub) 04:45 Section Cleanup and Push to GitHub 01:48 Updates and Errata 1 lecture • 5min Git Mac OS X Updates 05:07 Conclusion 2 lectures • 6min Review 01:19 Bonus: Exclusive Student Discounts 04:49 Requirements Basic Computer Skills Ability to install software on your system Admin rights may be required for software installation Basic understanding of Git source control (add, commit, push and pull) Description Git Going with Comparing, Branching and Merging Are you sure how to compare between commits, branches or the three states of Git? Do merges cause you trouble? What is a rebase , anyway? In this course, students will walk though comparing (diffs), branching, merging and rebasing in Git. At the end of this course, students will have a firm understanding and experience with those paricular aspects of Git. Note: This is not a comprehensive course on Git -- we focus exclusively on comparing , branching , merging , and rebasing . Recent Course Updates October 17: Added Updates and Errata section Course Outline Course Introduction and Overview provides an introduction to this course. After the introduction, the first thing we do is Git Installation for both Windows and Mac. There are dedicated sections for Windows and Mac -- so students can jump directly to the lectures specifically designed for their system. After the installation process, we will download the example project repository from GitHub (clone) which we will use throughout the course. After installation and downloading the example project, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories. We give great attending to Branching and Merging in Git. We start off with the simple "happy path" and learn about "Fast-Forward" merges and how to control them. The we walk through common "automatic" merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool. With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing . In that section, we cover several rebasing examples, including how to resolve a rebase conflict. All tools have installation and configuration sections to ensure no one is left behind. Course Features Presentations provide audio/video training of conceptual ideas. Since few like slide-ware presentations, slide-presentations are kept to a minimum. Screencasts provide a video of the instructor's computer system with any actions, commands, or screens displayed and narrated. There is nearly 2 hours of screencast based video training in order to step through each command or action in sufficient detail. Special Notes This course is part of the "Git Going" series and is included with the Git Complete comprehensive course. If you are already enrolled in that course, do not enroll in this course. This course makes extensive use of the command line . Each command is discussed in detail, so everyone can follow along. Who this course is for: Anyone that needs learn about comparing, branching, merging and rebaseing within Git Not for Git beginner (should be taken after intro course on Git) Software engineers, developers, programmers on teams using branches Show more Show less Instructor Jason Taylor Lead Software Engineer, Dev Trainer (19 courses,50k reviews) 4.4 Instructor Rating 70,403 Reviews 485,847 Students 19 Courses With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems. Show more Show less Udemy Business Teach on Udemy Get the app About us Contact us Careers Blog Help and Support Affiliate Impressum Kontakt Terms Privacy policy Cookie settings Sitemap © 2021 Udemy, Inc. window.handleCSSToggleButtonClick = function (event) { var target = event.currentTarget; var cssToggleId = target && target.dataset && target.dataset.cssToggleId; var input = cssToggleId && document.getElementById(cssToggleId); if (input) { if (input.dataset.type === 'checkbox') { input.dataset.checked = input.dataset.checked ? '' : 'checked'; } else { input.dataset.checked = input.dataset.allowToggle && input.dataset.checked ? '' : 'checked'; var radios = document.querySelectorAll('[name="' + input.dataset.name + '"]'); for (var i = 0; i (function(){window['__CF$cv$params']={r:'6777a3909e7b06cd',m:'186dc0d9a74386222f8479b39e3979b3883476d8-1627743025-1800-AZXINl1vMZfF0pEThMV7QZVyfMeaA5e+rppgoZp1zVLIRj60W6/OzYvlmT9+2XFrCmV5uPVqMyIhq8LPokixk0GAylpGN1CLsVCEA2vwmZn1vcG+IRUfP1sqLHCOlTgs7gs65udcyBLQ54dWsYCxUrzLtVyF+PvYL/rMYoG2c5Rw',s:[0xacbc7005ad,0x3095472e65],}})();
  4. Merge branches and resolve conflicts Rebase branches and resolve conflicts Curated for the Udemy Business collection Course content 9 sections • 37 lectures • 2h 14m total length Expand all sections Introduction 1 lecture • 5min Course Introduction Preview 04:53 Windows Installation 6 lectures • 22min Installation Overview for Windows Preview 00:44 Git for Windows Preview 05:40 Notepad++ Install 02:08 Notepad++ Configuration 03:23 P4Merge for Windows Install 05:42 P4Merge for Windows Configuration 04:18 Mac OS X Installation 6 lectures • 14min Installation Overview for Mac OS X Preview 00:56 Apple Git on Mac OS X (Yosemite and above) Preview 01:11 TextMate 2 Install 03:09 TextMate 2 Configuration 03:06 P4Merge for Mac Install 01:57 P4Merge for Mac Configuration 04:07 Setup 1 lecture • 3min Course Project Repository Preview 03:08 Comparing in Git 8 lectures • 22min Git Repository Setup (for Comparing examples) 05:47 Comparing Working Directory and the Staging Area Preview 02:24 Comparing Working Directory and the Git Repository (Last Commit) 01:44 Comparing Between the Staging Area and the Git Repository (Last Commit) 01:38 Limiting Comparisons to one File (or Path) 01:54 Comparing Between Commits 04:32 Comparing Between Local and Remote Master Branches 02:00 Comparison Section Cleanup and Push back to GitHub 01:32 Branching and Merging in Git 6 lectures • 34min Branching Basics Preview 04:43 Happy Path / Fast Forward Merges 06:39 Happy Path / Disable Fast Forward Merges 04:07 Automatic Merges 05:25 Conflicting Merges and Resolution 11:35 Section Clean up and Push back to GitHub 01:32 Rebasing in Git 6 lectures • 24min Simple Rebase Example 08:16 Setup a Rebasing Conflict 02:45 Abort a Rebase 02:01 Rebase Conflict and Resolution 03:59 Pull with Rebase (GitHub) 04:45 Section Cleanup and Push to GitHub 01:48 Updates and Errata 1 lecture • 5min Git Mac OS X Updates 05:07 Conclusion 2 lectures • 6min Review 01:19 Bonus: Exclusive Student Discounts 04:49 Requirements Basic Computer Skills Ability to install software on your system Admin rights may be required for software installation Basic understanding of Git source control (add, commit, push and pull) Description Git Going with Comparing, Branching and Merging Are you sure how to compare between commits, branches or the three states of Git? Do merges cause you trouble? What is a rebase , anyway? In this course, students will walk though comparing (diffs), branching, merging and rebasing in Git. At the end of this course, students will have a firm understanding and experience with those paricular aspects of Git. Note: This is not a comprehensive course on Git -- we focus exclusively on comparing , branching , merging , and rebasing . Recent Course Updates October 17: Added Updates and Errata section Course Outline Course Introduction and Overview provides an introduction to this course. After the introduction, the first thing we do is Git Installation for both Windows and Mac. There are dedicated sections for Windows and Mac -- so students can jump directly to the lectures specifically designed for their system. After the installation process, we will download the example project repository from GitHub (clone) which we will use throughout the course. After installation and downloading the example project, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories. We give great attending to Branching and Merging in Git. We start off with the simple "happy path" and learn about "Fast-Forward" merges and how to control them. The we walk through common "automatic" merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool. With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing . In that section, we cover several rebasing examples, including how to resolve a rebase conflict. All tools have installation and configuration sections to ensure no one is left behind. Course Features Presentations provide audio/video training of conceptual ideas. Since few like slide-ware presentations, slide-presentations are kept to a minimum. Screencasts provide a video of the instructor's computer system with any actions, commands, or screens displayed and narrated. There is nearly 2 hours of screencast based video training in order to step through each command or action in sufficient detail. Special Notes This course is part of the "Git Going" series and is included with the Git Complete comprehensive course. If you are already enrolled in that course, do not enroll in this course. This course makes extensive use of the command line . Each command is discussed in detail, so everyone can follow along. Who this course is for: Anyone that needs learn about comparing, branching, merging and rebaseing within Git Not for Git beginner (should be taken after intro course on Git) Software engineers, developers, programmers on teams using branches Show more Show less Instructor Jason Taylor Lead Software Engineer, Dev Trainer (19 courses,50k reviews) 4.4 Instructor Rating 70,403 Reviews 485,847 Students 19 Courses With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems. Show more Show less Udemy Business Teach on Udemy Get the app About us Contact us Careers Blog Help and Support Affiliate Impressum Kontakt Terms Privacy policy Cookie settings Sitemap © 2021 Udemy, Inc. window.handleCSSToggleButtonClick = function (event) { var target = event.currentTarget; var cssToggleId = target && target.dataset && target.dataset.cssToggleId; var input = cssToggleId && document.getElementById(cssToggleId); if (input) { if (input.dataset.type === 'checkbox') { input.dataset.checked = input.dataset.checked ? '' : 'checked'; } else { input.dataset.checked = input.dataset.allowToggle && input.dataset.checked ? '' : 'checked'; var radios = document.querySelectorAll('[name="' + input.dataset.name + '"]'); for (var i = 0; i (function(){window['__CF$cv$params']={r:'6777a3909e7b06cd',m:'186dc0d9a74386222f8479b39e3979b3883476d8-1627743025-1800-AZXINl1vMZfF0pEThMV7QZVyfMeaA5e+rppgoZp1zVLIRj60W6/OzYvlmT9+2XFrCmV5uPVqMyIhq8LPokixk0GAylpGN1CLsVCEA2vwmZn1vcG+IRUfP1sqLHCOlTgs7gs65udcyBLQ54dWsYCxUrzLtVyF+PvYL/rMYoG2c5Rw',s:[0xacbc7005ad,0x3095472e65],}})();
  5. Rebase branches and resolve conflicts Curated for the Udemy Business collection Course content 9 sections • 37 lectures • 2h 14m total length Expand all sections Introduction 1 lecture • 5min Course Introduction Preview 04:53 Windows Installation 6 lectures • 22min Installation Overview for Windows Preview 00:44 Git for Windows Preview 05:40 Notepad++ Install 02:08 Notepad++ Configuration 03:23 P4Merge for Windows Install 05:42 P4Merge for Windows Configuration 04:18 Mac OS X Installation 6 lectures • 14min Installation Overview for Mac OS X Preview 00:56 Apple Git on Mac OS X (Yosemite and above) Preview 01:11 TextMate 2 Install 03:09 TextMate 2 Configuration 03:06 P4Merge for Mac Install 01:57 P4Merge for Mac Configuration 04:07 Setup 1 lecture • 3min Course Project Repository Preview 03:08 Comparing in Git 8 lectures • 22min Git Repository Setup (for Comparing examples) 05:47 Comparing Working Directory and the Staging Area Preview 02:24 Comparing Working Directory and the Git Repository (Last Commit) 01:44 Comparing Between the Staging Area and the Git Repository (Last Commit) 01:38 Limiting Comparisons to one File (or Path) 01:54 Comparing Between Commits 04:32 Comparing Between Local and Remote Master Branches 02:00 Comparison Section Cleanup and Push back to GitHub 01:32 Branching and Merging in Git 6 lectures • 34min Branching Basics Preview 04:43 Happy Path / Fast Forward Merges 06:39 Happy Path / Disable Fast Forward Merges 04:07 Automatic Merges 05:25 Conflicting Merges and Resolution 11:35 Section Clean up and Push back to GitHub 01:32 Rebasing in Git 6 lectures • 24min Simple Rebase Example 08:16 Setup a Rebasing Conflict 02:45 Abort a Rebase 02:01 Rebase Conflict and Resolution 03:59 Pull with Rebase (GitHub) 04:45 Section Cleanup and Push to GitHub 01:48 Updates and Errata 1 lecture • 5min Git Mac OS X Updates 05:07 Conclusion 2 lectures • 6min Review 01:19 Bonus: Exclusive Student Discounts 04:49 Requirements Basic Computer Skills Ability to install software on your system Admin rights may be required for software installation Basic understanding of Git source control (add, commit, push and pull) Description Git Going with Comparing, Branching and Merging Are you sure how to compare between commits, branches or the three states of Git? Do merges cause you trouble? What is a rebase , anyway? In this course, students will walk though comparing (diffs), branching, merging and rebasing in Git. At the end of this course, students will have a firm understanding and experience with those paricular aspects of Git. Note: This is not a comprehensive course on Git -- we focus exclusively on comparing , branching , merging , and rebasing . Recent Course Updates October 17: Added Updates and Errata section Course Outline Course Introduction and Overview provides an introduction to this course. After the introduction, the first thing we do is Git Installation for both Windows and Mac. There are dedicated sections for Windows and Mac -- so students can jump directly to the lectures specifically designed for their system. After the installation process, we will download the example project repository from GitHub (clone) which we will use throughout the course. After installation and downloading the example project, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories. We give great attending to Branching and Merging in Git. We start off with the simple "happy path" and learn about "Fast-Forward" merges and how to control them. The we walk through common "automatic" merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool. With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing . In that section, we cover several rebasing examples, including how to resolve a rebase conflict. All tools have installation and configuration sections to ensure no one is left behind. Course Features Presentations provide audio/video training of conceptual ideas. Since few like slide-ware presentations, slide-presentations are kept to a minimum. Screencasts provide a video of the instructor's computer system with any actions, commands, or screens displayed and narrated. There is nearly 2 hours of screencast based video training in order to step through each command or action in sufficient detail. Special Notes This course is part of the "Git Going" series and is included with the Git Complete comprehensive course. If you are already enrolled in that course, do not enroll in this course. This course makes extensive use of the command line . Each command is discussed in detail, so everyone can follow along. Who this course is for: Anyone that needs learn about comparing, branching, merging and rebaseing within Git Not for Git beginner (should be taken after intro course on Git) Software engineers, developers, programmers on teams using branches Show more Show less Instructor Jason Taylor Lead Software Engineer, Dev Trainer (19 courses,50k reviews) 4.4 Instructor Rating 70,403 Reviews 485,847 Students 19 Courses With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems. Show more Show less Udemy Business Teach on Udemy Get the app About us Contact us Careers Blog Help and Support Affiliate Impressum Kontakt Terms Privacy policy Cookie settings Sitemap © 2021 Udemy, Inc. window.handleCSSToggleButtonClick = function (event) { var target = event.currentTarget; var cssToggleId = target && target.dataset && target.dataset.cssToggleId; var input = cssToggleId && document.getElementById(cssToggleId); if (input) { if (input.dataset.type === 'checkbox') { input.dataset.checked = input.dataset.checked ? '' : 'checked'; } else { input.dataset.checked = input.dataset.allowToggle && input.dataset.checked ? '' : 'checked'; var radios = document.querySelectorAll('[name="' + input.dataset.name + '"]'); for (var i = 0; i (function(){window['__CF$cv$params']={r:'6777a3909e7b06cd',m:'186dc0d9a74386222f8479b39e3979b3883476d8-1627743025-1800-AZXINl1vMZfF0pEThMV7QZVyfMeaA5e+rppgoZp1zVLIRj60W6/OzYvlmT9+2XFrCmV5uPVqMyIhq8LPokixk0GAylpGN1CLsVCEA2vwmZn1vcG+IRUfP1sqLHCOlTgs7gs65udcyBLQ54dWsYCxUrzLtVyF+PvYL/rMYoG2c5Rw',s:[0xacbc7005ad,0x3095472e65],}})();