Am 21.09.10 11:41, schrieb Ilari Liusvaara:
git checkout -f master
git fetch origin
git reset --hard origin/master
You definitely do not want to run merge non-interactively (conflict risk!)
oh good point, thanks a lot.
Bye,
Matthias
--
"Programming today is a race between software engineers striving to
build bigger and better idiot-proof programs, and the universe trying to
produce bigger and better idiots. So far, the universe is winning." --
Rich Cook
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html