On 8.9.2010 16:25, Jiri Slaby wrote:
On 09/08/2010 11:52 AM, Michal Marek wrote:
Jiri, we have a script to automatically merge kernel-source.changes conflicts and properly sort the entries. If you run scripts/install-git-hooks, it will configure git to use it, otherwise read the comment in scripts/rpm-changes-merge.pl. I fixed the current breakage with
$ scripts/rpm-changes-merge.pl -1 kernel-source.changes
Sorry for that, I forgot to do it.
If you (re)run scripts/install-git-hooks, it will set this script as the merge driver for *.changes files and you won't have to worry about *.changes conflicts anymore :). Michal -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org