Git Feature Branch Workflow Model

This post briefly captures the process of using Feature Branch Workflow for version controlling a project.

Introduction

Git is software for tracking changes in any set of files, usually used for coordinating work among programmers collaboratively developing source code during software development. Its goals include speed, data integrity, and support for distributed, non-linear workflows.

Feature Branch Workflow, the core idea behind this is that all feature development should take place in a dedicated branch instead of the master branch. This encapsulation makes it easy for multiple developers to work on a particular feature without disturbing the main codebase. It also means the master branch will never contain broken code, which is a huge advantage for continuous integration environments.

Goals

1. Clone a remote git repository
2. Create a branch
3. Merge branch with master branch
4. Push local changes to remote repository

Minimum Requirements

• Git

STEP 1 - Clone a remote git repository

• git clone
  clone a remote repository to a local system.
  example - git clone https -//github.com/username/repository.git

STEP 2 - Create a branch

1. git checkout -b branchName
   create and switch to a branch called branchName

2. git push -u origin branchName
   links local branchName with remote corresponding branch
   push local branch to remote repository for the first time (first time only)

STEP 3 - Merge branch with master branch

1. git check out master
   point local environment to master branch

2. git pull
   ensure local copy of our master branch has all latest changes from remote repository

3. git merge branchName
   merge branch changes from branchName with current branch. In this case, master branch

STEP 4 - Push local changes to remote repository

1. git push
   push local master to remote master

Now local and master is up-to-date.