<br><div><div>Greetings</div><div><br></div><div>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</div><div><br></div><div><a href="http://www.mythtv.org/wiki/ATI_Remote_Wonder#Mythbuntu_10.10_without_lirc">http://www.mythtv.org/wiki/ATI_Remote_Wonder#Mythbuntu_10.10_without_lirc</a></div>
<div><br></div><div>That guide sends me to here:</div><div><br></div><div><a href="http://www.mythtv.org/wiki/Remapping_remote_control_key_codes_greater_than_255">http://www.mythtv.org/wiki/Remapping_remote_control_key_codes_greater_than_255</a></div>
<div><br></div><div>which tells me to do the following:</div><div><br></div><div>sudo apt-get install git-core</div><div><br></div><div>and then</div><div><br></div><div>git clone git://<a href="http://www.thenautilus.net/xf86-input-evdev">www.thenautilus.net/xf86-input-evdev</a></div>
<div>cd xf86-input-evdev</div><div>git pull git://<a href="http://www.thenautilus.net/xf86-input-evdev">www.thenautilus.net/xf86-input-evdev</a> code-remap-2.4.0</div><div><br></div><div>That last command gives an error:</div>
<div><br></div><div>----8<----</div><div>$ git pull git://<a href="http://www.thenautilus.net/xf86-input-evdev">www.thenautilus.net/xf86-input-evdev</a> code-remap-2.4.0</div><div>From git://<a href="http://www.thenautilus.net/xf86-input-evdev">www.thenautilus.net/xf86-input-evdev</a></div>
<div> * branch code-remap-2.4.0 -> FETCH_HEAD</div><div>Auto-merging man/Makefile.am</div><div>CONFLICT (content): Merge conflict in man/Makefile.am</div><div>Auto-merging man/evdev.man</div><div>Auto-merging src/evdev.c</div>
<div>Auto-merging src/evdev.h</div><div>Automatic merge failed; fix conflicts and then commit the result.</div><div>----8<----</div><div><br></div><div>What does this mean? How might I fix this?</div><div><br></div><div>
Thank you! :)</div><div><br></div><div>-FBP</div></div><div><br></div><div><br></div>