In a checked out copy of the trunk: %cvs update -j more-purple% Review changes, resolve conflicts %cvs commit -m "merged more-purple"%