[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [IMP-dev] Preparation for release 1: Trying out git

Riccardo hi

Hugest difference from svn in git is that you also have a local repository, so you can checkout locally without updating the remote repoisotory. So it is worthwhile learning git a bit on its own indeed. THAT BEING SAID, if you just want to clone a fresh version of IMP develop branch from the github repository, do a few changes, commit them ("add" "commit" and "push" in git terminology), and update occasionally with the main IMP repository ("pull" in git terminology), then go here:Âhttps://github.com/salilab/imp/wiki/Getting-started-as-a-developer

in general, a quick and very inaccurate conversion guide:
(1) svn checkout URLÂ
==>Âgit clone URL

(2) svn commit -m "MESSAGE"Â
==>Âgit commit -a -m "MESSAGE" ; git pushÂ
orÂ
==>Âgit add <specific files/folders> ; git commit -m "MESSAGE" ; git push

(3) svn update
==> git pullÂ

(4) svn logÂ
==> git log

(5) svn statusÂ
==> git status




On Wed, Apr 17, 2013 at 8:38 PM, Daniel Russel <" target="_blank">> wrote:
There are a ton of git/svn comparisons out there already (google "git vs svn"). I'm not sure we need to produce a new one. But perhaps link to an existing one.


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 <" target="_blank">> 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/


- 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.
what is imp-flow vs git-flow? is this a typo?

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

Using a branch (feature or hotfix) allows changes to be shared and inspected more easily. I'll update the wiki with the above ideas.


and by wiki, you mean: https://github.com/salilab/imp/wiki

_______________________________________________
IMP-dev mailing list
" target="_blank">
https://salilab.org/mailman/listinfo/imp-dev


_______________________________________________
IMP-dev mailing list
">
https://salilab.org/mailman/listinfo/imp-dev




--
Barak