[mythtv-users] git error with ATI Remote Wonder on mythbuntu 10.10

[F.B. Parker]

Greetings

I'm trying to get an ATI Remote Wonder to work with my mythbuntu
10.10/mythtv 0.24 box. I'm using the guide in the wiki at

http://www.mythtv.org/wiki/ATI_Remote_Wonder#Mythbuntu_10.10_without_lirc

That guide sends me to here:

http://www.mythtv.org/wiki/Remapping_remote_control_key_codes_greater_than_255

which tells me to do the following:

sudo apt-get install git-core

and then

git clone git://www.thenautilus.net/xf86-input-evdev
cd xf86-input-evdev
git pull git://www.thenautilus.net/xf86-input-evdev code-remap-2.4.0

That last command gives an error:

----8<----
$ git pull git://www.thenautilus.net/xf86-input-evdev code-remap-2.4.0
>From git://www.thenautilus.net/xf86-input-evdev
 * branch            code-remap-2.4.0 -> FETCH_HEAD
Auto-merging man/Makefile.am
CONFLICT (content): Merge conflict in man/Makefile.am
Auto-merging man/evdev.man
Auto-merging src/evdev.c
Auto-merging src/evdev.h
Automatic merge failed; fix conflicts and then commit the result.
----8<----

What does this mean? How might I fix this?

Thank you! :)

-FBP
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.mythtv.org/pipermail/mythtv-users/attachments/20110514/df5759ca/attachment.html