New subject: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?

23 Dec 2013

...
 Adding
main/thirdparty/libreoffice/3.3.2/patches/libreoffice-
trinity-debian.diff
Adding main/thirdparty/libreoffice/3.3.2/patches/NOTES
CONFLICT (directory/file): There is a directory with name 
main/thirdparty in
HEAD. Adding main/thirdparty as
main/thirdparty~023b18ec6b52629d8666d284152f6147af098595
Auto-merging main/tdewebdev
CONFLICT (submodule): Merge conflict in main/tdewebdev
Auto-merging main/tdevelop
CONFLICT (submodule): Merge conflict in main/tdevelop
Auto-merging main/tdeutils
CONFLICT (submodule): Merge conflict in main/tdeutils
Auto-merging main/tdetoys
...

The concern I have is I get those CONFLICT messages even if I re-
run the script
after it completes. Is there some magic git command I should run 
to resolve the CONFLICT? 
I never have seen those errors and I'm the last person around here 
to ask for help with git. I hate git. Yet Another Overly 
Complicated Tool Created By Masochistic Geeks Intended Only for 
Masochistic Geeks. :)

I hold my breath every time I resync my local tree.

My guess is you are seeing those errors because your local tree is 
long out-of-date. Perhaps delete each affected CONFLICT module and 
then run the switch_all_submodules_to_head_and_clean script. Yeah, 
again and again. Or, consider deleting the entire local tree and 
perform a git clone --- overnight because the repo is 5.5 GB or so. 
tde-i18n is the biggest pig module of them all and will take the 
longest.

Darrell

Re: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?