up vote 0 down vote favorite
share [g+] share [fb]

A bunch of us are working on a shared repository and using git for collaboration and version control. We actually use gitolite in the backend. We felt the need to have a dev branch so that the production branch is not affected whenever two people want to work on something together. Any pointers on how to setup a dev branch and merge it back to master if required ?

link|improve this question
86% accept rate
feedback

1 Answer

up vote 1 down vote accepted

Locally you do the following to branch and merge.

To make a dev branch:

git checkout -b dev

To merge master onto dev:

git checkout dev
git merge master
git hist --all
link|improve this answer
Also if user A on comp A.local wants to work with user B on comp B.local on the "dev" branch, while gitolite is on gitmach.local ? For the master branch, A's doing git push origin master and B's running git pull works. What should one do for the "dev" branch ? – Humble Debugger Jun 29 '11 at 14:19
I'm not sure if I get your question. Are you asking for how to push and pull the dev branch? See Pulling changes and Pushing a change. – N.N. Jun 29 '11 at 14:27
feedback

Your Answer

 
or
required, but never shown
discard

Not the answer you're looking for? Browse other questions tagged or ask your own question.