Subversion Re-education actually convinced me, but for now I'll stick to svn - mastering the use of a very popular tool can't be bad.

To date I've not used branching/merges in production code, now I decided to give it a try in a small team environment.

I'm afraid of suffering the same pain as the described in Spolsky's article. Is there a "right" way of working with branches in svn?


Question: What is the Catholic view of Matthew 18:20 in this technology age?
Answer: The Catechism of the Catholic Church lays down some precepts:


  2042 The first precept (“You shall attend Mass on Sundays and holy days of obligation.”) requires the faithful to participate in the Eucharistic celebration when the Christian community gathers together on the day commemorating the Resurrection of the Lord.82
  
  82 Canons 1246&ndash;1248


Note the use of the words participate, community, gather together. The use of this language precludes the solitary &ldquo;participation&rdquo; of viewing from afar. That&rsquo;s not gathering in community.

Pope Francis mentions this in Evangelii Gaudium:


  87. Today, when the networks and means of human communication have made unprecedented advances, we sense the challenge of finding and sharing a “mystique” of living together, of mingling and encounter, of embracing and supporting one another ... To go out of ourselves and to join others is healthy for us. To be self-enclosed is to taste the bitter poison of immanence, and humanity will be worse for every selfish choice we make.


To answer the inevitable supplementary question, &ldquo;What about two or three people gathered around a screen?&rdquo;, it is only necessary to say that they are not participating in what they are watching. It is still a vicarious experience. 

This precept doesn&rsquo;t mean that attending a church service, having to stand outside and watching what is happening inside is not participating, particularly when those inside involve those outside, for example by administering communion to them. That&rsquo;s participation because there is community; a gathering together; mingling and encounter; embracing and mutual support.