Michael Haggerty <mhag...@alum.mit.edu> writes:

> * When I think a batch of patches is ready, I merge them to my master
> and publish my master somewhere.  (Or is it better I publish the feature
> branch and leave it to you to merge directly to your master?)

I think I missed this part, but in the case of git-svn, what we do
is the former.  The branch Eric makes me pull may be called 'master'
in his repository, but it does not contain anything unrelated to
git-svn, so from _my_ viewpoint, it is a single "topic to improve

But from Eric's point of view, it is an aggregation of different
topics from many people on top of my tree, and each topic may tackle
its own theme. I think most of the pulls from him so far were single
strand of pearls without merges, but if two or more long topics were
cooking in his tree, it would have been perfectly reasonable for him
to resolve such inter-topic conflicts before telling me to pull the

After all, that is what the sub-maintainer of an area is.  One who
knows the area the best coordinates possibly conflicting changes
brought in different topics to the area.

Ths same can go for multimail, or any contrib/ material for that
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to