Updating '.':
Skipped 'swig\python\extensions\osr_wrap.cpp' -- Node remains in conflict
Skipped 'swig\python\extensions\gdal_array_wrap.cpp' -- Node remains in conflict
Skipped 'swig\python\extensions\gdal_wrap.cpp' -- Node remains in conflict
Skipped 'swig\python\extensions\ogr_wrap.cpp' -- Node remains in conflict
Skipped 'swig\python\osgeo\ogr.py' -- Node remains in conflict
U    port\cpl_vsil_stdout.cpp
U    apps\ogr2ogr.cpp
U    ogr\ogr_srs_esri.cpp
U    ogr\ogrsf_frmts\generic\ogr_gensql.cpp
U    ogr\ogrsf_frmts\openfilegdb\ogropenfilegdblayer.cpp
U    ogr\ogrsf_frmts\pg\ogrpgtablelayer.cpp
U    frmts\vrt\vrtsources.cpp
U    frmts\vrt\vrtrasterband.cpp
U    frmts\wms\wmsdriver.cpp
U    frmts\pds\frmt_pds.html
U    frmts\pds\pdsdataset.cpp
U    frmts\hfa\hfaband.cpp
Updated to revision 30443.
Summary of conflicts:
  Skipped paths: 5
