"PIO update" fails

Wanted to update to the latest platform (espressif32) and issued the “pio update” on the command line and got this response below.

PS C:\Users\Niels\Documents\PlatformIO\Projects\nanoBrewer> pio update
Updating platformio/contrib-piohome 3.3.4 @ ~3.3.4 [Up-to-date]
Updating platformio/contrib-pysite 2.37.191020 @ ~2.37.0 [Incompatible 2.39.201019]
Updating platformio/tool-unity 1.20500.200612 @ ~1.20500.0 [Up-to-date]
Updating platformio/tool-scons 4.40200.0 @ ~4.40200.0 [Up-to-date]
Updating platformio/tool-cppcheck 1.250.0 @ ~1.250.0 [Up-to-date]

Platform Manager

Platform espressif32

Updating platformio/espressif32 3.3.2 [Up-to-date]
Updating platformio/toolchain-xtensa32 2.50200.97 @ ~2.50200.0 [Up-to-date]
Updating platformio/toolchain-esp32ulp 1.22851.191205 @ ~1.22851.0 [Up-to-date]
Updating platformio/framework-arduinoespressif32 3.10006.210326 @ ~3.10006.0 [Up-to-date]
Updating platformio/framework-espidf 3.40300.0 @ ~3.40300.0 [Up-to-date]
Updating platformio/tool-esptoolpy 1.30100.210531 @ ~1.30100.0 [Up-to-date]
Updating platformio/tool-openocd-esp32 2.1000.20210721 @ ~2.1000.0 [Up-to-date]
Updating platformio/tool-mkspiffs 2.230.0 @ ~2.230.0 [Up-to-date]
Updating platformio/tool-cmake 3.16.4 @ ~3.16.0 [Up-to-date]
Updating platformio/tool-ninja 1.9.0 @ ^1.7.0 [Up-to-date]
Updating platformio/tool-mconf 1.4060000.20190628 @ ~1.4060000.0 [Up-to-date]
Updating platformio/tool-idf 1.0.1 @ ~1.0.1 [Up-to-date]

Platform espressif32

Updating platformio/espressif32 1.12.4 [Detached]
Updating platformio/toolchain-xtensa32 2.50200.97 @ ~2.50200.0 [Up-to-date]
Updating platformio/toolchain-esp32ulp 1.22851.191205 @ ~1.22851.190618 [Up-to-date]
Updating platformio/framework-arduinoespressif32 3.10004.210126 @ ~3.10004.191002 [Up-to-date]
Updating platformio/tool-esptoolpy 1.20600.0 @ ~1.20600.0 [Up-to-date]
Updating platformio/tool-openocd-esp32 1.1000.20190709 @ ~1.1000.20181026 [Up-to-date]
Updating platformio/tool-mkspiffs 2.230.0 @ ~2.230.0 [Up-to-date]
Updating platformio/tool-cmake 3.16.4 @ ~3.16.0 [Up-to-date]
Updating platformio/tool-ninja 1.9.0 @ ^1.7.0 [Up-to-date]
Updating platformio/tool-mconf 1.4060000.20190628 @ ~1.4060000.0 [Up-to-date]
Updating platformio/tool-idf 1.0.1 @ ~1.0.1 [Up-to-date]

Platform espressif32

Updating platformio/espressif32 2.1.0 [Detached]
Updating platformio/toolchain-xtensa32 2.50200.97 @ ~2.50200.0 [Up-to-date]
Updating platformio/toolchain-esp32ulp 1.22851.191205 @ ~1.22851.0 [Up-to-date]
Updating platformio/framework-arduinoespressif32 3.10004.210126 @ ~3.10004.191002 [Up-to-date]
Updating platformio/framework-espidf 3.40100.200827 @ ~3.40100.0 [Up-to-date]
Updating platformio/tool-esptoolpy 1.30000.201119 @ ~1.30000.0 [Up-to-date]
Updating platformio/tool-openocd-esp32 2.1000.20210721 @ ~2.1000.0 [Up-to-date]
Updating platformio/tool-mkspiffs 2.230.0 @ ~2.230.0 [Up-to-date]
Updating platformio/tool-cmake 3.16.4 @ ~3.16.0 [Up-to-date]
Updating platformio/tool-ninja 1.9.0 @ ^1.7.0 [Up-to-date]
Updating platformio/tool-mconf 1.4060000.20190628 @ ~1.4060000.0 [Up-to-date]
Updating platformio/tool-idf 1.0.1 @ ~1.0.1 [Up-to-date]

Platform espressif32

Updating git+https://github.com/platformio/platform-espressif32.git 2.1.0+sha.1d1a7ca [Updating to 2.1.0+sha.1e0f147]
git version 2.24.1.windows.2
error: Your local changes to the following files would be overwritten by merge:
platform.py
Please commit your changes or stash them before you merge.
Aborting
Updating 1d1a7ca…1e0f147
Error: VCS: Could not process command [‘git’, ‘pull’, ‘–recurse-submodules’]
PS C:\Users\Niels\Documents\PlatformIO\Projects\nanoBrewer>

Apparently the update fails, based on the last couple of lines:

error: Your local changes to the following files would be overwritten by merge:
platform.py
Please commit your changes or stash them before you merge.
Aborting
Updating 1d1a7ca…1e0f147
Error: VCS: Could not process command [‘git’, ‘pull’, ‘–recurse-submodules’]

Any help would be appreciated.

Solved:

Needed to delete all platform folders in the file system and re-install (pio update).