Udemy Business

Teach on Udemy

Turn what you know into an opportunity and reach millions around the world.

Learn More

Your cart is empty.

Keep shopping

Git Workflows In Depth. Feature Branch, Forking, GitFlow

Name: Git Workflows In Depth. Feature Branch, Forking, GitFlow
Rating: 3.0 (54 reviews)

Learn most popular git workflows, start to use them and become a better developer!

Created byArthur Tkachenko

Last updated 8/2019

English

English [Auto],Korean [Auto],

What you'll learn

How to collaborate inside of development team by using git workflows
What is a centralized workflow and how it works
What is a feature branch workflow and how it works
What is a forking workflow and how it works
What is a gitflow workflow and how it works

Course content

4 sections • 58 lectures • 2h 39m total length

Comparing Workflows Part13:18
Compare main Git workflows—feature branches, forking, and GitFlow—and learn to choose and implement a consistent, team-aligned approach that minimizes conflicts and deploy issues.
Comparing Workflows Part22:37
Compare git workflows and their role in the development process, define four major sections, and offer flexible guidelines you can mix and match across projects.
What is a successful Git Workflow?4:42
Identify what makes a Git workflow successful by evaluating team culture, size, and preferences. Choose an approach that minimizes cognitive overhead and improves how changes are reviewed and coordinated.
Centralized Workflow Intro4:21
Explore centralized workflows with a single central repository, master as the main branch, and feature branches merged into master, comparing to SVN and highlighting workflow stability and simplicity.
Centralized Workflow Part23:48
Master the centralized workflow in git, leveraging local copies for independent work and a robust branching and merging model to share changes via a remote repository.
Centralized Workflow - How it works2:13
Understand how the centralized workflow coordinates local commits with a central repository, using pushes to maintain branches and keep the official project synchronized.
Centralized Workflow. Initialize the central repository2:06
Initialize a central repository on a server or hosting service, creating or importing a project, and connect using your username and host to set up the centralized workflow.
Central repositories3:44
Learn how to initialize and use central repositories, clone them locally, and configure origin aliases to push changes across Git workflows.
Make changes and commit to central repos3:00
Learn to make changes, stage files in the staging area, and commit locally to build a clear git history on your machine, then push when ready to the central repository.
Push new commits to central repository2:47
Push your local commits to the central repository using git push origin <branch>, understand origin as the default remote, and resolve conflicts manually so others can see the changes.
Centralized Workflow. Managing Conflicts2:52
Explore managing conflicts in a centralized git workflow by fetching from the central repository, resolving conflicts manually, and using abort and restart options to maintain a linear history.
Centralized workflow example11:20
Explore a centralized workflow with John and Mary collaborating from local feature work to a shared central repository, handling pushes, pulls, rebases, and conflicts to keep a clean project history.
Where to go from here2:49
Transition from a centralized workflow to a feature branch workflow to boost flexibility for teams of varying skill levels and enable in-depth discussions before merging into main.
Other common workflows1:30
Explore other common git workflows beyond centralized models, highlighting flexible options like architecture-focused and advanced flows that help developers manage daily work more effectively.
Feature branching2:44
Feature branching extends centralized flow by creating a separate branch for new features, keeping production code intact on the master branch, enabling safe collaboration and continuous integration.
GitFlow workflow1:46
Compare centralized workflows with gitflow and outline a three-branch model designed around the project area. Assign specific roles to branches and define how they interact to ship releases.
Forking workflow2:15
Compare centralized workflow to forking workflow, showing a central base repository, local clones, and how developers push changes to the main code base.
Guidelines1:51
Align team culture with business goals and implement git workflows using feature branches, forking, and gitflow, mapping branches to tasks, bugs, and releases with Jira or GitHub issues.
Guidelines - Part23:44
Adopt short-lived branches to reduce conflicts between production and development and keep master stable for frequent releases. Use reversible workflows to jump back to prior changes and test effectively.
Summary1:43
Explore centralized versus decentralized Git workflows, compare their tradeoffs, and learn how business requirements shape choosing the right approach for your project.

Feature Branch Workflow Intro1:25
Explore how a dedicated feature branch isolates development, enables testing by multiple developers, and preserves a stable master branch for CI environments such as Travis CI and GitLab CI.
Why to use Feature Branch Workflow3:17
Explore why the feature branch workflow uses pull requests for discussion and sign-off before integrating into the main base. Leverage GitHub for code reviews and draft pull requests.
Feature Branch Workflow Intro Part30:58
Explore how the feature branch workflow provides a modular framework for managing branches and forking, aligning with gitflow and other repository workflows.
How it works3:18
Learn how a central repository uses the master branch as official history, and why teams create a new feature branch for each task, using meaningful names and task numbers.
Life-cycle0:53
Explore the life cycle of feature branches, including pushing to the central repository, sharing for validation, and handling official code within the workflow.
Start with the master branch2:29
Begin by using the master branch and keep it updated from origin master. Then create and switch to a feature branch to work on changes.
Codebase changes2:04
Create and check out a separate feature branch, pull the latest changes, and push commits to the remote repository using git add, git commit, and git status.
Push feature branch to remote repository3:28
Push your local feature branch to the remote repository origin to back up work, enable others to access changes, and prepare for reviews and merging via a pull request.
PR feedback and merge4:52
Submit a pull request with a descriptive summary and changes from your feature branch. Then await team review, resolve comments and conflicts, and merge into master under governance.
PR Code review2:03
Code reviews with pull requests enable early discussion of changes via draft requests and inline comments, following a centralized workflow that syncs with upstream master and merges branches.
Feature Branch Workflow Example10:26
Create a feature branch from main, edit and stage files, commit, and push to origin. Open a pull request for code review and merge into main with a three-way merge.
Summary1:44
Explore feature branch workflow, git flow workflow, and forking to organize branches and promote collaboration through pull requests and code reviews throughout the merge history.

Forking Workflow Intro2:08
Explore the forking workflow, where each contributor maintains a private local repository and a public fork, then uses pull requests to propose changes to the central repository's main branch.
Forking Workflow Intro Part21:07
Explore the forking workflow and how contributors can push to their own repos while maintainers push to the official repo, enabling comments from any developer without broad access.
Forking Workflow Intro Part31:44
forking workflow follows a distributed branch model based on git flow, merging feature branches into the original project. encourage open source collaboration by supporting contributions, documentation updates, and link checks.
How it works3:26
Explore how forks create personal copies of the central repository and how pull requests channel changes back to the main codebase. Learn how developers work from forks and collaborate.
How it works - Part22:57
Learn how to fork a project, create feature branches, push changes to your personal repository, and create pull requests to official repo, including drafts and updates in review and merge.
How it works - Part31:40
Explore how feature branches, forking, and git flow coordinate changes from contributors to the official repository, including local checks, merging to master, and forking when maintainers restrict workflows.
Forking vs cloning0:53
Explain that forking creates a copy of a repository as a separate project, while cloning makes a local copy of your repository and preserves its history of changes.
Branching in the Forking Workflow1:52
Understand branching in the forking workflow and GitFlow, where feature branches and forks share changes by pulling into others' local repos and pushing to the official history.
Fork a repository2:05
Fork a repository to create your own copy, keep it up to date with upstream, and manage forks, cloning, and pull requests within Git workflows.
Clone your fork1:00
Fork your GitHub repository to your own account and clone your fork to your local machine using git clone, enabling you to work independently from the main project.
Adding a remote3:16
Add and manage remotes in a fork: configure origin and upstream to push your changes and pull updates from the official repo, and handle authentication with username and email.
Working in a branch making pushing changes2:54
Create and switch to a feature branch, commit with descriptive messages, push to a remote, and pull from upstream to keep a centralized repository up to date while resolving conflicts.
Making a Pull Request3:06
Push your feature branch to the remote, file a detailed pull request explaining changes and rationale, then coordinate with maintainers to merge into the upstream develop branch.
Summary2:26
Fork an open source repository, clone locally, create a feature branch, commit and push to your fork, then open a pull request to the main codebase.
Summary Part21:52
Learn how forking and pull requests streamline collaboration by allowing maintainers to review code changes from numerous contributors, while open source and private workflows control releases.

Gitflow Workflow Intro1:23
Explore the gitflow workflow, a robust branch framework for large projects, outlining official and feature branches, release cycles, pull requests, and how isolated experiments boost collaboration.
Getting Started3:11
Git workflows in depth by creating and merging feature and fix branches, using master and release branches, and applying GitFlow and forking patterns to manage bugs and releases.
develop and master branches3:26
Explore how git flow uses develop as the integration branch and master for production, with feature branches and a git flow extension to initialize, manage, and push changes.
Feature branches1:46
Create each feature on its own feature branch off the latest develop, push for collaboration, then merge back into develop using git flow naming conventions and commands.
Finishing a feature branch1:30
Finish a feature branch by merging it into the main branch using git merge or git flow feature finish, then start a new feature branch to continue work.
Release branches1:28
Apply release branches to freeze features, move bug fixes and documentation, then merge into master, tag the version, and also merge back into club.
Release branches - Part24:08
Explore release branches to polish the current release while new features develop, and learn how to merge release branches back into master and develop using git flow or alternatives.
Hotfix branches3:11
Explore hotfix branches within Git workflows, creating dedicated bug-fix lines off master, merging fixes into master and release branches to maintain stable production while continuing development.
Gitflow Workflow Example2:50
Demonstrates a git flow example with feature and fix branches, showing merges from develop to master and branch cleanup.
Summary1:35
Explore the Git flow workflow as a release-based software process. Learn how develop, master, and release branches interact, with feature branches merging into develop and fixes flowing to production.
End of our course0:47
Congratulations on reaching the end; learn to differentiate and start using various git workflows, from simple branching to more advanced GitFlow, and prepare for the next course.

Requirements

You should understand basics of Git

Description

A Git Workflow is a recommendation for how to use Git to accomplish best from it.

More consistent, productive work for developers.

More effective work inside of the team.

A more flexible way to manage code changes.

There is no silver bullet for how to work with Git.

No standards.

When a team has a coding workflow, it's important to understand the logic of how changes should be applied to the codebase.

There a few worldwide used popular Git workflows.

We’ll be discussing them during this course.

Why Care about Git workflow you can ask me.

It's actually better to start to care about before things get painful :)

Case1: You are trying to manage the integrity of a codebase that has numerous developers jumping in and out. And you get a conflicting release schedule.

Case2: When you get tired of wondering why features are disappearing before deployment.

Case3: When you don’t have time to dig through the commit diffs of 500 commits to find out why a push from a specific person causes major unintended changes to your project.

Case4: When a feature that’s not ready for release sneaks its way into production and the whole project can be broken.

Case5: When you can’t have a conversation, explaining to clients/team leader (again) that you can’t release feature X because feature Y has not yet cleared QA.

I hope you see, there a lot of things can be avoided by applying a clean workflow.

When you choose a git workflow for your project, you should have an answer for 5 major questions:

1. How much visibility do you need?

2. How much flexibility do you need?

3. Is collaboration important to your workflow?

4. How much control do you need?

5. How important is ease of use to you?

I'm sure that during the course you'll get a better understanding of what type of workflow should be incorporated.

Who this course is for:

Developers that wants to extend their knowledge about different ways to collaborate, using git

Git Workflows In Depth. Feature Branch, Forking, GitFlow

What you'll learn

Explore related topics

Course content

Introduction, Comparing Workflows, Central Workflow20 lectures • 1hr 5min

Feature branch workflow12 lectures • 37min

Forking Workflow15 lectures • 32min

GitFlow workflow11 lectures • 25min

Requirements

Description

Who this course is for: