so I downloaded the Makefile-openembedded-1.5 from
http://opendreambox.org/~obi/Makefile-opendreambox-1.5
but here is the error I get
Code
Branch org.openembedded.dreambox set up to track remote branch refs/remotes/origin/org.openembedded.dreambox.
error: Entry 'classes/autotools.bbclass' would be overwritten by merge. Cannot merge.
make: *** [/home/updatelee/dreambox/cvs-oe/dm800/openembedded/.git] Error 1
this is a clean folder so I know its not some old residual file