op25 boatbod update issue

[n8zuz]

I'm sure there is a simple answer but when I run a "git pull" I'm getting the following errors.

opey@opeyserver:~/op25$ git pull
Updating 34762cf..0e6701b
error: Your local changes to the following files would be overwritten by merge:
op25/gr-op25_repeater/apps/meta.json
op25/gr-op25_repeater/apps/multi_rx.py
op25/gr-op25_repeater/apps/p25_demodulator.py
op25/gr-op25_repeater/apps/rx.py
op25/gr-op25_repeater/apps/terminal.py
op25/gr-op25_repeater/apps/tk_p25.py
op25/gr-op25_repeater/apps/tk_smartnet.py
op25/gr-op25_repeater/apps/trunking.py
Please commit your changes or stash them before you merge.
Aborting

What causes this and how do I fix?

Thanks

 

[lwvmobile]

local changes somewhere causing the pull to fail, try running

git reset --hard
git pull

or if you want to keep your local changes, run:

git stash save "local changes"
git pull

and put your stashed changes back with:

git stash list
git stash apply

 

[boatbod]

Any time you make changes to a tracked file (i.e. one of the op25 source files) there is a risk that you won't be able to "git pull" because it would overwrite the changes with the new download. As @lwvmobile pointed out there are several ways to work around this. The key thing is to save anything you want to preserve before you reset/revert.