On Tue, Nov 20, 2007 at 06:33:50PM +0100, Sven Verdoolaege wrote:
I'll try to boil this down to the simplest case possible. If
submodules can do this I'll be really happy :)
Developer A makes a change in submodule1 and in submodule2
Developer B makes a change in submodule2 and in submodule3
A and B don't know about eachother. They send their modifications
somewhere (push to a shared repository with a well chosen branch name,
for example), or send a mail "please pull from my repo" to the patch
queue manager.
It is absolutely crucial that for each developer, either both their
modifications go in, or none of them. Git should make picking only
one of their modifications hard.
Also - it would be very good if the history in the master repo would
match the history in all developers' repositories (as the
modifications are merged in by the patch queue manager). I.e. - you
should see a "gif support" feature branch, see the commits on it, and
finally the merge.
- Finn Arne
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html