Comment 0 for bug 1478063

This recipe:
# bzr-builder format 0.3 deb-version {debupstream}+{date}
lp:dosbox
merge packaging lp:~i30817/dosbox/packaging
nest-part patch lp:munt DOSBox-mt32-patch debian/patches

which is trying to merge a debian dir from the packaging branch and then import some files from another branch directory into the subdir debian/patch

Is failing with this buildlog
https://launchpadlibrarian.net/212606413/buildlog.txt.gz

Conflict adding file debian/patches. Moved existing file to debian/patches.moved.
1 conflicts encountered.
bzr: ERROR: bzrlib.errors.BzrCommandError: Conflicts from merge

Notice that the directory nested is different, what is really needed is to copy the dir (or maybe, ideally, the files) into the debian/patches dir.