Rebuilding fails after latest git pull

Searched meta, nothing related/useful to my problem found (this topic didn’t help)

Git pull
./launcher rebuild web_only
Produces this error:
“Your local changes to the following files would be overwritten by merge: samples/web_only.yml.
Please commit your changes or stash them before you merge.”
Failed to update.

Getting this msg continuously until I cancel the operation.

Well, you’ll need to do what it says.

You might also be able to

 git checkout samples/web_only.yml

but a

 git stash

should also do it.


How I wonder, how many things are!!

Thanks ji.