For those who are interested, the move Sharpy mentioned took us just over a day to complete. Dozens of projects, years of SVN history, everything was moved painlessly to git using SourceTree, our build server was reconfigured and without any drama we were done. We chose to use bitbucket rather than github as we were already a heavy user of other atlassian products, and their pricing model was more suited to our requirements, but github would have served us equally well.
Since I started using git I have purchased and/or used many git gui tools, including: Gitbox GitHub GitX SourceTree Tower I still have all of them installed on my mac, but SourceTree is the only one I leave running all the time. I'm not saying that it is the best of these tools, only that it does everything I need well enough that I use it every day. One feature of SourceTree that seems well supported, but one I have never really explored, is native SVN support. SourceTree has integrated support for cloning and then pushing/pulling a local git repo to and from an SVN source. I also have eGit installed in eclipse, but rarely use it for SCM operations. It's main benefit to me is for visual cues about what branch I am using and what files have uncommitted changes without having to switch to SourceTree and check. Since the switch we have made some great screw ups getting used to how to use git the way it's intended, what the terminology actually means and how to use the tools we have correctly, but a big advantage of using git is that if you haven't pushed the changes it doesn't usually matter how badly you screwed up, everything is fixable. As sharpy said, to know git you must use it, and to use it you have to really use it. On 28/03/2012, at 9:16 PM, Michael Sharp wrote: > After reading the "Most Requested" thread I thought I'd relay my experiences, > not about WOnder but about SCM in general. This all occurred within a team > environment but I'll refrain from using the term "we" as it's more about my > perspective. > > For my projects, I used svn. Not really used, just sort of got by with it. > > I was cycling through the 2 svn/eclipse integration tools that I was aware of > when one pissed me off more than the other, or with every eclipse upgrade. > > I was rarely using any svn features beyond commit/update after being > repeatedly "touched" by getting into all sorts of trouble with branching and > merging. > > I was profane x100 anytime I had to do any sort of moving, deleting or > refactoring with folders/directories. > > It was a sheltered and sad SCM existence, but I was a bit daunted and > overwhelmed with the git thing. I was putting up with the devil I knew.. > > We moved to git. The birds chirped and the sun shone! Well not quite, but the > I think the key message is that we were using git. Mileage is invaluable. > > I had no choice but to manage my local and remote repos. I employed a > standalone tool, SourceTree (maybe if I did this for svn I would have > advanced with it too). Along with egit and cli I had an arsenal to work out > any issues. > > I made mistakes and still do, but I don't find myself painted into a corner > like a was so many times fighting with Subversion or Subclipse. > > For a project like WOnder I'd look at maintaining a private remote repo > (bitbucket's good with unlimited private repos, or if you're so inclined, pay > for github) to start with. Maintain the changes from the upstream master, > make the mistakes munging/rebasing/merging/breaking your changes in with the > upstream. Making these sort of messes on a public GitHub repo was/is > definitely off putting for me.. > > For my projects I now I find myself creating feature branches for the most > trivial of changes, because I can, confidently. I'm rebasing this, stashing > that, pushing etc etc and generally using an SCM system as it was intended - > I think :-/ > > Summary: if you want to use git, you have to use git.. > > Sharpy.. > _______________________________________________ > Do not post admin requests to the list. They will be ignored. > Webobjects-dev mailing list ([email protected]) > Help/Unsubscribe/Update your Subscription: > https://lists.apple.com/mailman/options/webobjects-dev/qdolan%40gmail.com > > This email sent to [email protected]
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Do not post admin requests to the list. They will be ignored. Webobjects-dev mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/webobjects-dev/archive%40mail-archive.com This email sent to [email protected]
