James Bigler wrote: > OK, so this is what I ended up doing: > > 516 git branch topics/FixCudaVersionAfterFirstRun > 0d30e3fe91717f519722a71470a5180c13818a2a > 518 git checkout -b next origin/next > 520 git pull > 526 git merge topics/FixCudaVersionAfterFirstRun > 528 git push -> failed with non-fast-forward
It was probably master that did not fast forward because the default is to push all matching branches, and your local master was too old. Did you follow the initial setup instructions: http://public.kitware.com/Wiki/Git/Workflow/Topic#Initial_Setup $ git config --global push.default tracking ? Alternatively you can push just the one branch: $ git push origin next > 529 git reset --hard origin/next > 530 git merge topics/FixCudaVersionAfterFirstRun > 534 git push -> failed with non-fast-forward again. I reread this > thread and did the following This time it was almost certainly master that did not fast forward. > 535 git checkout master > 538 git reset --hard origin/master > 541 git checkout next > 543 git push -> Succeeded This confirms it. -Brad _______________________________________________ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
