svn-update version mismatch with commit version

view story

http://stackoverflow.com – I'm having this issue updating my code with my partner's code. My partner's last submission was on revision 36, but when I updated my working directory svn said the version jumped to 38. I don't know why it did this. When I was updating I made one of the conflicting files accept my version. Also my partner copied something into her own svn before I updated mine. Which part of these caused the mismatch in the version number? Thanks (HowTos)