Avi uses github, and RStudio is supposed to coordinate well with it, so I gave it a go. After much angst, I finally got it to work, but haven't reproduced the steps yet. 'Steve' at github suggested another way to do it that was confusing to me, but admitted that my way "will work as well." I've been using tortoisesvn on windows (7) and the two work differently enough to make github seem difficult for me. This meetup (out West) looks potentially helpful: www dot meetup dot com/BayNET/events/162385852. Anyone have suggestions?
I actually prefer Bitbucket to github for various reasons, mainly that they allow unlimited free repositories for private use as long as there are five or fewer contributors. As I tend to work solo, that is GREAT for me.
To address your specific question, you do not need to use another verson control overlay like one of the "tortoise"s or even Git GUI. Most of the functionality is built into Rstudio if you created the Rstudio project as having version control or you assined it to version control after it was created. For complicated (resetting heads) or less-frequent (tagging) activities, RStudio can always create a Git command-line shell from which you can do pretty much anything.
If you really want a dektop app for use with git, I'd recommend Atlassian's SourceTree. Granted, they are the people behind BitBucket, but it should work seamlessly with any Git or Mercurial repository hosted anywhere (locally, Github, etc.).
I use Mercurial, for instance here. See this comparison of Git and Mercurial for more information, but they are similar, perhaps Mercurial is easier to use but Git is more flexible. We also use Tortoise, but the Mercurial version. Both mercurial and Tortoise work under both windows and linux.
At work there are a couple of us using it, and I think it does take a while to wrap your head around. For small groups I doubt there's any real advantage over Subversion. (Although if everyone already knows how to use a DCVS like Mercurial or Git then there wouldn't be any disadvantage either.)
The "Thinking in Git" meetup was helpful to understand the Git pedigree (written by author of Linux) and under-the-hood machinery. Speaker, Rob Richardson, claimed Git will "take over the world" in ways originally envisioned for Linux — which didn't pan out. You can find a link to Rob's presentation on his website robrich.org — click the Slides link at the top.
Supposedly branching and merging are much easier in Git (it's so confusing in svn that I haven't bothered to learn).
Will this committee have need for a DCVS? Probably not, except for those folks who someday might collaborate on code.
I did set up a toy project on github for people to play with at <https://github.com/aadler/OSSCIntro>. E-mail me if you cannot access it.
As a basic reference to Git, I find the Pro-Git online book indispensable. I don't have enough karma to post the link directly, but a google search for "git book" should turn it up easily.
Sorry Avi, I have fixed the forums, you shouldn't need "karma" now to post links. I think this is a link to the Pro-Git book.
I've been using Git and Github for some time and have no reason to complain. GitHub has a fairly basic but nice capacity to support websites to describe projects you're working on. This has been a very efficient way to put together instructions for workshops quite easily. As for IDE, GitHub for Windows couldn't be easier. As I'm migrating work to Ubuntu, I've had to use something else.
Hello, Brian.
You may be interested in this <https://confluence.atlassian.com/pages/viewpage.action?pageId=269982882>
I learned about 'diff' with svn .. fell in love with the way TortoiseSvn displays the difference between two files. What diff do the Git users prefer? I hear Kdiff3 is pretty good.