Testing should be done on your topic branch. Git makes this so ridiculously simple that I'm not even sure how to respond to the (apparent) assertion that it's difficult. Committing and merging is one of the areas where SVN can't even begin to compare with Git in terms of simplicity - or power. But that's really not a "hey, let's get you started with source control" kind of conversation.
I'll just say that anyone that thinks Git is difficult in this area has either a) never tried Git, or b) didn't read/understand the documentation or have someone help them through it. I've helped folks move their projects from no source control (their "source control" was creating zip files of the project folder every once in awhile) to using Git, and they've never looked back. On Wed, Jan 30, 2013 at 8:35 AM, Andrew Scott <[email protected]>wrote: > > The downside is that in a team environment, you constantly need to merge > and test and merge and test and commit. So you should be connected to the > Source Control to do this, and where I have found GIT to be a pain in the > ass with when multiple changes to a file can impact you. > > But I agree with Cameron too, if you're new to all this, SVN will be far > easier to get running with as all the tools are great and easier to use > than GIT. > > > -- > Regards, > Andrew Scott > WebSite: http://www.andyscott.id.au/ > Google+: http://plus.google.com/113032480415921517411 > > > > On Thu, Jan 31, 2013 at 1:27 AM, Donnie Bachan (Gmail) < > [email protected]> wrote: > > > > > I agree with Cameron on this one. We recently moved from SVN to Git > because > > we found that within our team it facilitated our workflow. We started > > implementing the practices outlined by Git Flow and that's been working > > really well. That doesn't mean that Git is better than SVN, it's just > > better in our case. One thing I do like is the fact that I can work on my > > local machine and then sync with the server when I'm connected at the > > office again. > > > > Best Regards, > > Donnie > > > > On Wed, Jan 30, 2013 at 2:23 PM, Cameron Childress <[email protected] > > >wrote: > > > > > > > > On Wed, Jan 30, 2013 at 4:42 AM, Adam Cameron wrote: > > > > > > > Before you go too far down the SVN route... > > > > > > > > > > To me, Git vs SVN is sort of like a Mac vs PC argument. Git is good, > SVN > > is > > > good. They are both VERY VERY widely used and I expect both to be > heavily > > > used for the foreseeable future. > > > > > > Like most technology questions, there is not just one "right" answer. > > > > > > To the OP - read up on Git and SVN and pick whichever you like, but > don't > > > feel bad in the least about choosing either one as a solution. They are > > > both perfectly fine choices. In fact, if you are struggling to > understand > > > getting SVN setup, I think that Git may be an even more painful option > > for > > > you (but give it a whirl and form your own opinion). > > > > > > -Cameron > > > > > > -- > > > Cameron Childress > > > -- > > > p: 678.637.5072 > > > im: cameroncf > > > facebook <http://www.facebook.com/cameroncf> | > > > twitter<http://twitter.com/cameronc> | > > > > > > > > > > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Order the Adobe Coldfusion Anthology now! http://www.amazon.com/Adobe-Coldfusion-Anthology/dp/1430272155/?tag=houseoffusion Archive: http://www.houseoffusion.com/groups/cf-talk/message.cfm/messageid:354135 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm
