How to merge two separate branches using Tortoise Git client

Here I am going to show you how to merge two separate branches into one using tortoise git client. Generally you or development team need to maintain separate line of development in different branches. So at some later point of time you need to merge your changes into another branch. Your team may manage different branches, such as feature branch for developing your features and changes are committed into feature branch and finally merged each feature branch into development branch and development branch to master branch that is generally remain…

Continue

How to clone and create remote Git repository branches using Tortoise Git

Here I will discuss on how to clone and create branch using tortoise git client. I assume here that a master branch already exists in the remote git repository. I will show you here how to clone the master repository in your local system using git client. You can also use the command line tool to clone the remote repository in your local system. Once cloning is done then I will show you how to create a development branch and a feature branch. For this example, I have a master…

Continue

How to rebase feature branch with master branch in Git repository

Introduction In this post we will discuss how to rebase feature branch with master branch in Git repository. We have seen post on Git tutorial using command line tool. We will also tell you here using command line tool how to rebase feature branch with master branch in Git repository. In Git, the rebase command integrates changes from one branch into another. It is an alternative to the merge command. But there is a difference between rebase and merge command.

Continue

Beginners Git Tutorial

This is a complete beginners tutorial on GIT version controlling system. In this tutorial I am going to show you how to create a new Git repository in your local system, how to add new files to the repository, how to commit changes in the existing files and how to check history. I’ve been using Subversion for a few years and I really like Subversion. Combined with TortoiseSVN, I can’t really imagine how it could be any better.

Continue