etmc/tmLQCD — Issue #26: Elaborate on collaboration process
Author: kostrzewa
Created: 2012-01-16 09:14:28+00:00
State: open

In my opinipn the section on the website describing the collaboration process for tmLQCD could be a bit more explicit to give some pointers:

git branch branchname
git checkout branchname
work,
git add [...],
git commit
work,
git add [...],
git commit...
git push origin branchname # send work to own fork on github

In addition, before submitting a pull request the person should resolve any conflicts that might have developed with the current state of the code. (this can also be done by the integrator of the pull request, but it will be additional work for us, which is not necessarily a bad thing). Doing this regularly will keep the codes in sync and make integration easier.

git remote add upstream git@github.com:etmc/tmLQCD.git
git fetch upstream -v
git merge upstream/master # merge any conflicts