Updating '.':
Skipped 'swig\python\osgeo\gdal.py' -- Node remains in conflict
U    swig\include\perl\typemaps_perl.i
U    configure
U    configure.in
U    ogr\ogrsf_frmts\ods\ogr_ods.h
U    ogr\ogrsf_frmts\ods\ogrodsdatasource.cpp
Updated to revision 37190.
Summary of conflicts:
  Skipped paths: 1