Maybe all Watchers were taught to start training with the quarterstaff?

I think it's more likely that Merrick did things his own way and Giles was never given his journals and therefore had no real idea of what Buffy's past training was. So he made reasonable assumptions and found out the hard way that he was wrong.