Unlimited Plugins, WordPress themes, videos & courses! Unlimited asset downloads! From $16.50/m

Next lesson playing in 5 seconds

Cancel

Free Preview: Git Basics: Branches

Introduction

00:41
  • Overview
  • Transcript

Branches are a key part of the Git workflow. With a branch, we can safely diverge from the main line of development to work on new features, and then later propose that they be integrated into the master branch. If your new feature is acceptable, it's just a merge or a rebase away from production. Not only that, but you can create an endless number of branches without any serious overhead.

In this Coffee Break Course, Envato Tuts+ instructor Ed Wassermann will show you how to use this killer feature of Git. So follow along and learn how easy it is to use branches in your own Git workflow.

Why not check out our Introduction to Git and GitHub or watch the other Coffee Break Courses in this series:

1. Git Basics: Branches

1.1 Introduction

The whole Git workflow is built around creating and fusing branches together. Branching is a killer feature of Git. As a beginner, it is important to understand its power and potential. Branching in Git is not only very easy, it is also very cheap. We always have a main line for development, the master branch. But we can create an endless number of branches without any serious side effects, except that the housekeeping is a good idea. With a branch, we can safely diverge from the main line of development and work on new features that can be proposed to be integrated into the master branch. If acceptable, it's just a merge or a rebased away from getting into production. If, on the other hand, the work on the branch does not fulfill the requirements needed, you can simply continue your work on that branch or abandon it altogether.