In the wiki it would be nice to have a chart with git and svn-equivalent commands (when applies)https://github.com/salilab/imp/wiki
_______________________________________________On Tue, Apr 16, 2013 at 1:35 AM, Yannick SPILL <yannick@salilab.org> wrote:
For those who didn't follow all of it, have a look at this picture
http://nvie.com/posts/a-successful-git-branching-model/what is imp-flow vs git-flow? is this a typo?
- if you are making a large change that, for example, touches a bunch of files or will not necessarily be finished before you would like to work on something else IMP related, use a git flow feature branch
- if you are making a change that you would like to share with other people before it is committed into develop (eg to get them to check it doesn't break anything, or to test it as you are developing it), use an imp-flow feature branch.
Why not the develop branch? It could be expected that the new module will be available for the next release, and it doesn't make sense to treat it as a hotfix either!
-if you are developing a new module or other large body of related code, create a new module in another repository and develop it against the release version of IMP
and by wiki, you mean: https://github.com/salilab/imp/wiki
Using a branch (feature or hotfix) allows changes to be shared and inspected more easily. I'll update the wiki with the above ideas.
_______________________________________________
IMP-dev mailing list
IMP-dev@salilab.org
https://salilab.org/mailman/listinfo/imp-dev
IMP-dev mailing list
IMP-dev@salilab.org
https://salilab.org/mailman/listinfo/imp-dev