scripts/tar-up.sh: Exclude directories and files left over from conflict
    resolution when copyting rpm/
    
    Directories are not used by obs, there is no point copying them.
    
    Files resulting from conflict resolution needlessly add noise, they
    should not be included in the package.