How to update (Linux)?

[VolkerMuehlhaus]

Dear all,

I tried to update using the method described here at the very bottom:

cd openEMS-Project
git pull --recurse-submodules
./update_openEMS.sh ~/opt/openEMS --python

When I try to run the update, this error comes up because I had modified one of the examples:

(openems) volker@i9csl:~/openEMS-Project$ git pull --recurse-submodules 
Fetching submodule AppCSXCAD
Fetching submodule CSXCAD
Fetching submodule CTB
Fetching submodule QCSXCAD
Fetching submodule fparser
Fetching submodule hyp2mat
Fetching submodule openEMS
Already up to date.
error: Your local changes to the following files would be overwritten by checkout:
	python/Tutorials/Simple_Patch_Antenna.py
Please commit your changes or stash them before you switch branches.
Aborting
fatal: Unable to checkout '0bc6c61ac1594137a56de640b7a240d551ce3376' in submodule path 'openEMS'

I have no clue about git commandline options, and could not find out what exactly I need to do. I want to drop my changes and overwrite, can anyone tell me what to do?

Best regards
Volker

[VolkerMuehlhaus]

I now deleted that changed local file which git complains about, and then the git pull --recurse-submodules ran with no errors. Is this the correct way to resolve this?

[thliebig]

Yes, git will not simply overwrite local changes if they are in conflict with the upstream/pulled version...