Asset management

me and a friend of mine are developing one game ( its pretty big) … she does all the art and i do programming. we are currently facing problem to manage art and audio assets. like, i use whatever she gives to me, but then she modifies it and i have to integrate it all over again. are there any ways to manage assets effectively , with out any need to re-do stuff over and over again.