Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

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 ?

share|improve this question

1 Answer 1

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
share|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

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

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