Hi, I develop on 3 different machines and since Jan. 4th (I think) I am getting the following git errors on all machines when doing a fetch for master:
git fetch --prune qgisupstream error: Ref refs/remotes/qgisupstream/master is at 314d144b4dc2ddba991cfd796550f26fa026aa64 but expected b2932deca188a59d2eeffbaf06acda748a31fd93 >From github.com:qgis/Quantum-GIS ! b2932de..314d144 master -> qgisupstream/master (unable to update local ref) error: Ref refs/remotes/qgisupstream/new_vector_api is at 353e7ab8cd7eaeea77b23a146d90be5283b26166 but expected 5b008006658b221eb080b64aca215fc879b6ca72 ! 5b00800..353e7ab new_vector_api -> qgisupstream/new_vector_api (unable to update local ref) Completed with errors, see above I checked through the recent history to see if someone accidentally included an existing, pushed commit into a rebase operation, but could not find any discrepancies. For qgisupstream/master the two commits have identical messages, but I think that should not matter (unless it is a bug in my git GUI client) and the qgisupstream/new_vector_api branch has different messages. Anyone have any ideas on what's going on here? Anyone else get those errors? Regards, Larry _______________________________________________ Qgis-developer mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/qgis-developer
