svn checkout

When I did the SVN Checkout this morning to go from 368 to 371, the following came up. [code]$ svn checkout http://instadmg.googlecode.com/svn/trunk instadmg A instadmg/AddOns/createUser/createUser.pkg/Contents/Resources/generatePasswordHash.py Conflict discovered in 'instadmg/AddOns/InstaUp2Date/CatalogFiles/10.6_vanilla.catalog'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options:[/code] I'm assuming that if I choose "r" for resolved - accept merged version of file - it will merge the update with the current?