CI merge marker checks
scarlett.gately.clark at gmail.com
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 kde.org> 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 
> and raise integration errors if markers were found. If you notice a
> false positive please poke me.
> kubuntu-devel mailing list
> kubuntu-devel at lists.ubuntu.com
> Modify settings or unsubscribe at:
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the kubuntu-devel