So I installed version 2.5.1+ and it's working great via git.
Now I want to update it by entering the command "git pull" and got a warning/error.
[user@myserver ~]$ cd /var/www/html/moodle
[user@myserver moodle]$ sudo git pull
[sudo] password for user:
remote: Counting objects: 2283, done.
remote: Compressing objects: 100% (326/326), done.
remote: Total 1447 (delta 1085), reused 1431 (delta 1080)
Receiving objects: 100% (1447/1447), 394.51 KiB | 457 KiB/s, done.
Resolving deltas: 100% (1085/1085), completed with 315 local objects.
From git://git.moodle.org/moodle
863d00c..b87b729 MOODLE_23_STABLE -> origin/MOODLE_23_STABLE
cd08b5c..a3d12f9 MOODLE_24_STABLE -> origin/MOODLE_24_STABLE
f171a8c..a9657ad MOODLE_25_STABLE -> origin/MOODLE_25_STABLE
bdd045c..a31e811 master -> origin/master
Updating f171a8c..a9657ad
error: Your local changes to 'badges/lib/backpacklib.php' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
Thoughts?