Fixing Git issue in update log

Running update I noticed this issue:-

Updating /var/www/emoncms/Modules/dashboard module
- git branch: stable
- git tags: 2.0.0-40-g208a357
- git status:

On branch stable
Your branch and 'origin/stable' have diverged,
and have 1 and 5 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   Views/dashboard_view.php
	modified:   module.json

Not exactly clear what this means use "git reset HEAD <file>..." to unstage

Not sure how this would have been changed, but if you are sure that there is nothing you have done or something you need to keep, you can reset the git repo. From the folder

cd /var/www/emoncms/Modules/dashboard
sudo git fetch origin
sudo git reset --hard origin/stable
sudo git clean -f -d
sudo git status

Iā€™d run an update again just to be sure it has cleared.

Many thanks, now have full clean update.

1 Like