CI merge marker checks

Scarlett Clark scarlett.gately.clark at
Fri Oct 16 23:13:36 UTC 2015

Thank you very much for this. Those darn markers have bit me a few times.

On Fri, Oct 16, 2015 at 3:59 AM, Harald Sitter <sitter at> wrote:

> It has happened more than once that git threw a merge conflict and in
> a hurry someone didn't resolve the conflict properly but simply git
> add a conflicting file. This leaves lingering merge markers (>>>>>>
> <<<<<<) in the file and potentially goes unnoticed for a long time as
> some files are not actually parsed at build time and thus the merge
> markers do not cause a build failure.
> I now added tech to detect this in the QA stage of all KCI builds [1]
> and raise integration errors if markers were found. If you notice a
> false positive please poke me.
> [1]
> HS
> --
> kubuntu-devel mailing list
> kubuntu-devel at
> Modify settings or unsubscribe at:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <>

More information about the kubuntu-devel mailing list