$ rm Aircraft/CRJ-200/CRJ-200-set.xml rm: cannot remove `Aircraft/CRJ-200/CRJ-200-set.xml': No such file or directory
ashutosh@arneb:/mnt/Maia/fgdata$ git pull git://mapserver.flightgear.org/fgdata master
From git://mapserver.flightgear.org/fgdata
 * branch            master     -> FETCH_HEAD
Updating f3172d8..962f3ee
error: Your local changes to 'Aircraft/CRJ-200/CRJ-200.xml' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.