Hi all,
I've been using git with my code for a couple of months now, but suddenly I've got and error. The only commands I use are

git commit -am "message"
then
git push unfuddle master
to push onto the net server

however suddenly I'm getting

! [rejected] master -> master (non-fast forward)

I've tried a pull from the master but this didn't fix it. I've check out the master and can see this

git checkout master
Ver2: needs merge
Source/HardwareConfig.c: needs merge
Source/HardwareConfig.h: needs merge
Source/Model_Control.c: needs merge

However I don't know how to fix this. Can anyone advise. Thanks.