Ah, nevermind,
it looks like those merges are done
transparently on the
client side. Sorry for the noise; GIT is a very
complex system that I do
not have a complete grasp of (and I suspect most people
don't either). :-)
So that leaves the main server resources being utilized
for:
1.) Submodule babysitting, due to GIT not having a "real"
remote submodule
feature like SVN does
2.) Patchset generation
Both of those are CPU and disk intensive operations.
Okay, so a significant issue is the server response. Nonetheless, what is
the/your preferred way to push patches? Is this correct?
cd [module]
git pull
[merge patches to module]
git commit -a
git push
Darrell
Yes, or this also works:
cd [module]
[merge patches to module]
git pull
git commit -a
git push
The main problem that seems to have been caused by your last commits was
silent rejection of a few of my commits at the push stage. This problem
was difficult to hunt down due to GIT's rather opaque error messages.
Moral of the story: GIT can be a royal pain at times. :-)
Tim