Michael Meeks venit, vidit, dixit 22.02.2011 16:34: > Hi there, > > So - yet again, I'm still a completely clueless git user :-) > basically the same setup and reproduction issue as last time, still > using a stable git: version 1.7.3.4 <PG> I'm sorry you're having reproduction issues. At least your git is stable. </PG> > > Setup: > git clone git://anongit.freedesktop.org/libreoffice/libs-core cd libs-core # I assume > git checkout integration/dev300_m98 > git remote add stage git://anongit.freedesktop.org/libreoffice/staging/libs-core > git fetch stage > > Reproduce: > rm -Rf * > git reset --hard # ie. totally clean tree. # Those two should be no-ops after following the above. > git merge stage/dev300 Is that stage/ooo/dev300? > > I get this output from the merge: I get thousands of conflicts. Have the branches moved since your post? It may be better to give us sha1 or stable tags. Are you doing any builds before merging? > PS. of course, perhaps this is 'just me' - for space / time / > simplicty / certainty reasons, I do a lot of "cp -lR foo/.git baa/" to > duplicate trees - but AFAIK all git operations are atomic and use > renames rather than in-place re-writing: right ? Ouch. See Brian's post :) Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html