> pull -s * This will not work. You need to pull each file that is marked as modified, prefixed by the -s option to take the server (the labs) version or -c to keep the version you have locally (and silence the error).
It is the work of moments to load the debug printed by pull -v into favorite plan9 editor, and modify it into a command line to fetch the modified files. -Steve
