Yes, timestamps are used to resolve conflicts, so new timestamps always win. The general recommendation is to run ntp on all of your machines.
If for some reason ntp is not an option, you can set the timestamp of what you ever need on the client, but you will have to develop your own way of synchronizing this value (getting ntp-work will almost always be easier).
source share