SWiT/RobotFightClubArena — pull request #2 by jvalleroy (2012-05-25 12:12:10+00:00)
Title: Some features for video file playback

I think the merging would go something like this (assuming you are working on different_approach branch):

$ git remote add jvalleroy git://github.com/jvalleroy/RobotFightClubArena.git
$ git fetch jvalleroy
$ git merge jvalleroy/different_approach
$ git push origin different_approach