On Fri, Aug 10, 2012 at 11:32 AM, Kuhn Matthias, Vermessung <Matthias.Kuhn at stadt-uster.ch> wrote: > Heh, bad luck :) > > Try: > git pull ( = git fetch + git checkout ) Actually git pull = fetch + merge Martin