Conflict detection is really cool and a saver. Feature to get latest script from server is probably the last best thing required in this plugin. Imagine you wrote 50 lines and then conflict is detected!
Pull should suffice. I understand Pull + Merge will be tough one.
Is this already planned or will be?