Unable to update to latest version

[woolfg1]

Hi Aaron

When I try to update using git pull origin main I get the following error

pi@Stratocumulus:~/indi-allsky $ git pull origin main
remote: Enumerating objects: 637, done.
remote: Counting objects: 100% (180/180), done.
remote: Compressing objects: 100% (104/104), done.
remote: Total 637 (delta 122), reused 116 (delta 76), pack-reused 457 (from 2)
Receiving objects: 100% (637/637), 956.94 KiB | 227.00 KiB/s, done.
Resolving deltas: 100% (414/414), completed with 17 local objects.
From https://github.com/aaronwmorris/indi-allsky

• branch main -> FETCH_HEAD
  2774919..a1d16a4 main -> origin/main
  Updating a905554..a1d16a4
  error: Your local changes to the following files would be overwritten by merge:
  indi_allsky/flask/templates/index_img.html
  Please commit your changes or stash them before you merge.
  Aborting

I dont know how to proceed

Warm Wishes

Graham

[aaronwmorris]

I think you have made some manual changes in your checkout. You can stash those changes in your local git repo...

git stash push

Then you can proceed with the git pull origin main

[woolfg1]

Hi Aaron

Many thanks - how do I get the original file (s) back afterwards ?

[aaronwmorris]

I believe you can run git stash pop but you may have to deal with the merge conflicts.

[woolfg1]

Hi Aaron

Thanks - just another quick question

Can you tell me what would be causing these artifacts in the clouds when replaying a timelapse - I think its something I changed a while ago but cant remember

what it was

[aaronwmorris]

That is probably stacking (Processing tab) that is causing that effect.

[woolfg1]

Hi Aaron

I dont think it can be that as I have stacking disabled

Regards

Graham

[aaronwmorris]

Nevermind, this is the star trails. This is normal when cloudy images are included in Star trails. You could increase the number of stars for the threshold to exclude cloudy images.