Personal tools
You are here: Home Members cawb 2008 Merging
Document Actions

Merging

We have a man who doesn't trust subversion. He fights it at every corner and attempts to subvert (sic) its use. It's rather annoying, since its primary purpose is to make everyone's life easier.

Habits develop over time. We all have them and we all cherish being able to do things in certain ways. When a habit is well honed over years of repetition with trial and error enhancements, it's easy to see why you would not want to abandon it.

That said, if the habit involves development practices and the habit doesn't scale, you shouldn't complain when nobody wants to help you. You need to give up a little control if you want the assistance of others. An agreed habit, if you like.

Currently, I develop along a branch in well ordered Subversion way, but when it comes to merging, we check out his trunk and my branch and perform some emacs magic before committing the cobbled masses into a new release of his trunk. Now of course, we no longer know who did what, or when, and we lose all information which was logged in my branch. But it is "better" so.


Powered by Plone CMS, the Open Source Content Management System

This site conforms to the following standards: