On Wed, Mar 23, 2011 at 11:21:51PM +1100, doiggl@velocitynet.com.au wrote:

Hello, How do I fix the error 'conflict in file series.conf' listed at [1] Ive asked at [2] too , but no luck. Thanks Glenn

[1] https://build.opensuse.org/package/view_file?expand=0&file=series.conf&package=kernel-reiser4&project=home%3Adoiggl&srcmd5=284e67e8636db4b2b5f086b2a915639b

[2] http://lists.opensuse.org/opensuse-kernel/2011-03/msg00055.html

My series.conf only has these lines in it.

patches.rpmify/reiser4-for-2.6.37.patch patches.kernel.org/patch-2.6.37.1 patches.kernel.org/patch-2.6.37.1-2 patches.kernel.org/patch-2.6.37.2-3 patches.kernel.org/patch-2.6.37.3-4

project detail https://build.opensuse.org/package/files?package=kernel-reiser4&project=home%3Adoiggl

osc pull vi series.conf ... edit out the conflict osc resolved series.conf Also there is a patches.rpmify.tar.bz2 conflict, you need to kill that too, I szuggest: cp patches.rpmify.tar.bz2.new patches.rpmify.tar.bz2 osc resolved patches.rpmify.tar.bz2 osc ci -m "conflicts resolved" Ciao, Marcus -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org