10 Mar
2012
10 Mar
'12
2:58 a.m.
On 9 Mar 2012, Timothy Pearson told this:
Not quite. I recognized some problems in GIT that could cause issues,
so
I wrote "babysitting" software that constantly combs through the GIT
tree,
making sure that all submodule references are up to date with the latest
code and similar housekeeping tasks. That babysitting software can and
does trigger commits to the tree, and it is these fixup commits that are
taking a long time to carry out.
Whatever Darrell did would have effectively wiped out my changes if it
weren't for the babysitting code. :-)
Tim UPDATE: GIT is actually smart enough it seems,
but it is taking many
hours
for it to merge everything correctly.
This makes no sense, I'm afraid. git merging is done on the client
side,
always, and at pull time, never at push time (really at 'git merge'
time, which is the second of two steps carried out by 'git pull').
Pushing never does a merge of any kind. You can only push on top of a
remote branch containing content you haven't pulled if you do a push
-f,
and that *deletes* the content you haven't pulled (hence the need for a
-f 'force' argument).
--
NULL && (void)