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