Fightin with my friends?

my friend and me startin fighting after she got a boyfriend she wasnt very nice i know i did something to ofend her but i meant it as a joke and i think she knew that i said sorry like a million times and she did a joke back but i didnt take it seriously and then she told her other friend to tell me that she doesnt want to see or talk to me again and that she could live with out talkin to me ever again.i thought we were supposed to be best friends. now when she going to dump her boyfriend she starts talkin to me again. should i talk to her again or just ignore her??????????????