Using Git for DevOps: Managing Conflict & Effectively Using Git Workflow

Git    |    Intermediate
  • 12 videos | 58m 44s
  • Includes Assessment
  • Earns a Badge
Rating 4.4 of 59 users Rating 4.4 of 59 users (59)
This course explores Git, a tool that supports version control, and the capability of identifying and building different workflows for better collaboration and release management for DevOps. In the course's 12 videos, you will learn to implement remote repositories and how to build projects that have proper workflows. You will learn how to manage and track branches in remote repositories. Learners will study the concept of change integration, and will work with Git rebase and Git Merge to integrate changes from one branch to another. The course then examines workflow patterns, and integration branch, topic branch, fork, clone, and release branch workflows. Learners will study scenarios leading to merge conflict, and you will learn how to fix merge conflicts by editing conflicting files. You will use the merge tool to implement three-way merging; learn how to work with Sourcetree, a free Git desktop client for developers; and learn to manage repositories and workflows. This course explores all the essential features of Gitflow and GitHub flow, including how to manage workflow and branches.

WHAT YOU WILL LEARN

  • Discover the key concepts covered in this course
    Demonstrate the steps involved in managing and tracking branches in remote repositories
    Describe the concept of change integration and compare the differences between git rebase and git merge
    Work with git merge and git rebase to integrate changes from one branch to another
    Recall the prominent workflow patterns that can be used to integrate contributed works in a project and maintain overall workflow in the project
    Illustrate scenarios leading to merge conflict and the essential approaches that can be adopted to handle merge conflicts
  • Demonstrate how to manage merge conflicts by editing conflicting files
    Implement three way merge using the merge tool
    Work with sourcetree to manage repositories and workflows
    Recall the essential features of gitflow and github flow and recognize how they simplify branch management
    Manage git workflows using gitflow with a focus on managing feature branches
    Recall approaches for resolving merge conflicts, integrate changes from one branch to another using git merge, and manage merge conflict by editing conflicting files

IN THIS COURSE

  • 1m 49s
  • 5m 49s
    In this video, you will learn how to apply the steps involved in managing and tracking branches in remote repositories. FREE ACCESS
  • Locked
    3.  Change Integration with Rebase and Merge
    4m 6s
    After completing this video, you will be able to describe the concept of change integration and compare the differences between Git rebase and Git merge. FREE ACCESS
  • Locked
    4.  Change Implementation across Branches
    6m 4s
    During this video, you will learn how to work with Git merge and Git rebase to integrate changes from one branch into another. FREE ACCESS
  • Locked
    5.  Workflow Patterns in Project Management
    5m 10s
    Upon completion of this video, you will be able to recall the prominent workflow patterns that can be used to integrate contributed works into a project and maintain overall workflow in the project. FREE ACCESS
  • Locked
    6.  Merge Conflict
    4m 14s
    After completing this video, you will be able to illustrate scenarios leading to merge conflicts and the essential approaches that can be adopted to handle merge conflicts. FREE ACCESS
  • Locked
    7.  Resolving Merge Conflict
    3m 17s
    In this video, you will learn how to manage merge conflicts by editing the conflicting files. FREE ACCESS
  • Locked
    8.  Working with the Merge Tool
    5m 51s
    In this video, you will learn how to use the merge tool to implement a three way merge. FREE ACCESS
  • Locked
    9.  SourceTree for Simplification
    6m 30s
    In this video, you will work with SourceTree to manage repositories and workflows. FREE ACCESS
  • Locked
    10.  GitFlow Frameworks
    4m 43s
    After completing this video, you will be able to recall the essential features of GitFlow and GitHub Flow and recognize how they simplify branch management. FREE ACCESS
  • Locked
    11.  Managing Features with GitFlow
    5m 8s
    In this video, learn how to manage Git workflows using GitFlow with a focus on managing feature branches. FREE ACCESS
  • Locked
    12.  Exercise: Git Merging and Change Integration
    6m 5s
    After completing this video, you will be able to recall approaches for resolving merge conflicts, integrate changes from one branch to another using Git merge, and manage merge conflict by editing conflicting files. FREE ACCESS

EARN A DIGITAL BADGE WHEN YOU COMPLETE THIS COURSE

Skillsoft is providing you the opportunity to earn a digital badge upon successful completion on some of our courses, which can be shared on any social network or business platform.

Digital badges are yours to keep, forever.

YOU MIGHT ALSO LIKE

Book Beginning Git and GitHub: Version Control, Project Management and Teamwork for the New Developer, 2nd Edition
Course Git & GitHub: Working with Git Repositories
Rating 4.5 of 537 users Rating 4.5 of 537 users (537)
Course Prompt Engineering for Git: Using Prompt Engineering to Work with Git Branches
Rating 5.0 of 1 users Rating 5.0 of 1 users (1)

PEOPLE WHO VIEWED THIS ALSO VIEWED THESE

Course Jenkins for DevOps: Automated Testing & Advanced Jobs Using Jenkins
Rating 4.5 of 248 users Rating 4.5 of 248 users (248)
Course Unit Testing in DevOps Software Development
Rating 2.9 of 175 users Rating 2.9 of 175 users (175)
Course Git & GitHub: Introduction
Rating 4.6 of 2641 users Rating 4.6 of 2641 users (2641)