How to structure GIT repositories for development and testing?

Question

We have been using GIT with Visual Studio 2008 for the last 2 years and are happy with the functionality it provides us. We have gone live with the new system today and from next week we need to start implementing new functionality for v2.0 of the system however we don't want people to pick up those changes as soon as they log in until v2.0 is finished.

I have heard of branches but never used them myself and I believe they will provide us with the functionality we need.

So my question is: what is the best way to structure our repositories so that we can develop v2.0 without affecting the live system?

We currently only have one repository and one branch and there are two developers in the company. I guess we will need a new branch called "Development" or something similar for v2.0, and the existing branch will be used for bug fixing of the current system.

Any advice and tips will be greatly appreciated

Answer 1

Branch : git checkout -b branchname

git commit -am "ur changes"

Merging: git checkout branchname

git merge mergingbranchname

You can create local branch in your client also

For details check out this link