Diddy was reportedly involved in a tense dispute with a woman during a stay at the Amangani luxury resort ... The group spent their first day by the pool, with photos of the outing later published ...