Git Workflow

Jump to bottom Edit New page

Paul Ray edited this page Feb 27, 2015 · 11 revisions

The basic git workflow is that developers should fork the repository and develop in feature branches, then send pull requests to the main nanograv/PINT github repository. Some useful commands for doing that are documented here.

Set up forked repository

Fork the nanograv/PINT repository with the github web interface and check it out to your local machine with git clone
Set up upstream tracking of the main repo with this command (the upstream repo will be called nanograv):
git remote add nanograv https://github.com/nanograv/PINT.git

Add a feature branch

git branch my_feature
git checkout my_feature
[edit files]
git commit
Then push to github and set the local and remote branches to track one another
git push -u origin my_feature
At this point, you can do a pull request

To update local master with nanograv/master

git fetch nanograv
git checkout master
git merge nanograv/master

QUESTION: Is is safe to then rebase your feature branch onto your local master?

QUESTION: What happens when your pull request is accepted?

QUESTION: What do you do at the end of the lifecycle for your my_feature branch?