> should expect this to work. Specific example, /sys/src/cmd/ip/ping.c > was modified for my hushping patch, but pull didn't grab it because I > had modified the copy there. If I run pull again with -s '', will it > get that file this time?
You get one override per line in plan9.log. If you have already run replica -c sys/src/cmd/ip/ping.c, then future pulls will not worry about the change that just happened. Future changes will make new conflicts that you'll have to resolve. If you haven't done that, then you can still run pull -s sys/src/cmd/ip/ping.c and will get the new one. Russ
