Hi, I wanted to add a patch to kernel-default. The steps I did where as follows: 1) branch kernel-default to my home-project 2) 'osc checkout' on my local machine 3) added my patch to patches.driver.tar.bz2 4) test-build on my local machine (worked fine) 5) 'osc commit' to update the patches.driver.tar.bz2 However, on the OBS servers it won't build. The error is "Link has errors: conflict in file patches.drivers.tar.bz2" See details here: https://build.opensuse.org/package/show/home:Aikhjarto:branches:Kernel:stabl... Does anyone know how to get rid of this error? BR Thomas -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org