[Kde-scm-interest] Meeting minutes

[Thomas Zander]

On Thursday 12. November 2009 20.12.25 Ian Monroe wrote:
> > - merging mess (random conflict resolution). forward-merging stable =>
> >  master is hard enough in qt already, and that's a well-organized
> >  (kinda ;) company of full-time workers and "only" two major time
> > zones. imagine the bottlenecks in a disorganized bunch like kde. it
> > simply won't work.
>
> Huh? Why would there be a merging problem for "unrelated" apps in the
> same repo?

What he is likely referring to is when you want to push you first have to 
pull so you have the latest version. If the repo is being pushed to rather 
aggressively by many people you might get into the situation that between 
your pull and push someone else pushed, so you need to do another pull.

I personally think this is not really an issue. In Qt I've had this only 
once in many months.  Combined with the fact that one push can contain a lot 
of commits a quick glance at the commit logs show that this is at worst a 
minor annoyance.
-- 
Thomas Zander