What is the meaning of each of the 9 branches of Openquake and Openquake-book

22 views
Skip to first unread message

jgomo3

unread,
Nov 8, 2011, 8:34:44 PM11/8/11
to openqu...@googlegroups.com
Hello,

I'm studying Openquake in order to help in the future.

Compiling the Openquake Book, based on the masterbranch, i found minor errors that i fixed in my fork. But, it is based on the master branch, and before sugesting the changes, i think i should understand what convention are you using with the branches (maybe the errors where fixed).

Regards.

monelli.damiano

unread,
Nov 9, 2011, 3:37:27 AM11/9/11
to openqu...@googlegroups.com
Hi jgomo3,

if you want to contribute to the OpenQuake Book I would suggest you to create a fork of the openquake-book repository (you need to create a Git account, and then just press the 'Fork' button).
You can then do the changes in a branch in your fork and then make a 'pull request'. We will review your changes, and then if they are ok we merge them into the master.

The 9 branches you currently see are 'development' branches, that we used to develop 'topics' that we then merged into the master branch.

Regards,

Damiano

Marco Milanesi

unread,
Nov 9, 2011, 3:33:54 AM11/9/11
to openqu...@googlegroups.com

hi jgomo3,

I suggest to:

git stash # in your master branch, if you haven't committed yet
git checkout -b oq-book-fixes # to create a new branch with the
changes
git stash pop # to reapply your changes to the current branch

When you are done, submit a pull request from your branch in your fork.

Thanks a lot for spotting/correcting bugs!

And welcome

ciao,
Marco

PS: git stash saves the uncommitted changes in the 'stash area' and lets
you to reapply changes in whatever branch you are in.

Reply all
Reply to author
Forward
0 new messages