trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: March 2012

Re: [trinity-devel] New tdewebdev GIT source Fails to build - crashes at 100% (tqt_enter_modal/tqt_leave_modal)

From: Darrell Anderson <humanreadable@...>
Date: Fri, 9 Mar 2012 12:03:24 -0800 (PST)
> 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