Lint - merge markers - ignore binary files.#1040

ewels merged 3 commits intonf-core:devnf-core/tools:devfrom

ewels:merge_markers_ignore_binaryewels/nf-core-tools:merge_markers_ignore_binaryCopy head branch name to clipboard