Went to the beach yesterday with some friends (happen to be classmates). My favorite classmate is this girl B. We talk about everything, she's fun to be around, and we both speak our minds to each other. Last time I hung out with her, we had a similar beach day which ended in me fucking her best friend in her house that night. I didn't stay the night, and I didn't accept her friend's FB request. So, of course, she brings it up at this current beach day.

This girl is the dominant one in her marriage, and can easily dominate the conversation. As she, two other classmates, and I go off to wade in the waves, she brings up the encounter and starts going off about us making noise in her house, me not responding to her friend, me not staying the night, and calling me a dick for doing so. She even gets one of our male BB classmates to agree with her about these things.

I'm deflecting her shit tests, but then she keeps asking me about how many women I've slept with. I keep it curt by laughing and saying "I've had my fair share", but she keeps pressing for a number. She asks me three or four times, and appears to be getting pissed off. I change the subject and start talking to our other two classmates (who are kinda bewildered after hearing the conversation).

After we get out of the water, I pull her aside and talked with her:

"Hey, what you said out there was kinda disrespectful."

"You know I was just fucking with you, right?"

"I know, but you kept pushing it and that wasn't cool. I'm down to talk about anything with you, but when we're with other people it's a different story."

She wasn't sure what to say after that. I told her there were no hard feelings and asked if we were cool, she said yeah, and we joined the rest of the group. She seemed fine the rest of the day and didn't bring up the encounter again after that.

What could I have done differently in this situation? What would you have done?