Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

morfik · 2019-10-03 21:55:26

Yes.

TeoBigusGeekus · 2019-10-03 21:57:50

$ git pull
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        1_accuweather
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting

Back to the stash circlejerk I'm afraid.

Last edited by TeoBigusGeekus (2019-10-03 21:58:21)

morfik · 2019-10-03 21:58:47

With -f.

TeoBigusGeekus · 2019-10-03 22:00:17

$ git pull -f
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        1_accuweather
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting

morfik · 2019-10-03 22:02:06

Try:

git checkout HEAD^ 1_accuweather
git checkout HEAD^ CHANGELOG

or

git checkout -- 1_accuweather
git checkout -- CHANGELOG

And then pull (it should go without -f).

Last edited by morfik (2019-10-03 22:04:49)

TeoBigusGeekus · 2019-10-03 22:05:11

$ git checkout HEAD^ 1_accuweather
Updated 1 path from 143f1ed
[[Time:01:00 Location:~/1_accuweather]]
$ git checkout HEAD^ CHANGELOG
Updated 1 path from 143f1ed
[[Time:01:00 Location:~/1_accuweather]]
$ git pull
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting
[[Time:01:00 Location:~/1_accuweather]]
$ git pull -f
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting

morfik · 2019-10-03 22:05:49

Try:

git checkout -- 1_accuweather
git checkout -- CHANGELOG

TeoBigusGeekus · 2019-10-03 22:06:03

[[Time:01:01 Location:~/1_accuweather]]
$ git checkout -- 1_accuweather
[[Time:01:02 Location:~/1_accuweather]]
$ git checkout -- CHANGELOG
[[Time:01:02 Location:~/1_accuweather]]
$ git pull
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting

morfik · 2019-10-03 22:09:16

Show `git status`

TeoBigusGeekus · 2019-10-03 22:10:58

$ git pull
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting
[[Time:01:02 Location:~/1_accuweather]]
$ git status
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   CHANGELOG

morfik · 2019-10-03 22:12:04

git restore --staged CHANGELOG

This should do the job, then pull.

Last edited by morfik (2019-10-03 22:13:18)

TeoBigusGeekus · 2019-10-03 22:14:15

[[Time:01:07 Location:~/1_accuweather]]
$ git restore --staged CHANGELOG
[[Time:01:10 Location:~/1_accuweather]]
$ git pull
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting
[[Time:01:10 Location:~/1_accuweather]]
$ git pull -f
Updating a3595b7..b4c5f50
error: Your local changes to the following files would be overwritten by merge:
        CHANGELOG
Please commit your changes or stash them before you merge.
Aborting

morfik · 2019-10-03 22:16:19

WTF... why doesn't it remove the file?

TeoBigusGeekus · 2019-10-03 22:18:44

The power of Christ compels you!!!!!

Seriously now, I will delete everything tomorrow and start anew.
Thanks for the dedication morfik, I really appreciate it, but go to sleep now, it's 01:20 here, I don't know about Poland.
Good night...

morfik · 2019-10-03 22:23:12

This is solvable. But I don't know why the file can't be removed. Could you send me a zip of your local repo?

In Poland, it's 00:24.

Last edited by morfik (2019-10-03 22:24:03)

TeoBigusGeekus · 2019-10-03 22:25:16

I've deleted what've done and restored the copy I saved just before we started this session. Do you still want your zip?

morfik · 2019-10-03 22:25:53

Sure, send it to mmorfikov at gmail.com

TeoBigusGeekus · 2019-10-03 22:26:48

Closing to 01:30 here and tomorrow morning I have to be next to a river surveying with the company of a few bears (do you read S11)?

TeoBigusGeekus · 2019-10-03 22:28:20

It's over 25mb, I'll upload it to drive first.

morfik · 2019-10-03 22:28:29

What's S11?

#2901 2019-10-03 21:55:26

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2902 2019-10-03 21:57:50

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2903 2019-10-03 21:58:47

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2904 2019-10-03 22:00:17

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2905 2019-10-03 22:02:06

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2906 2019-10-03 22:05:11

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2907 2019-10-03 22:05:49

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2908 2019-10-03 22:06:03

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2909 2019-10-03 22:09:16

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2910 2019-10-03 22:10:58

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2911 2019-10-03 22:12:04

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2912 2019-10-03 22:14:15

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2913 2019-10-03 22:16:19

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2914 2019-10-03 22:18:44

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2915 2019-10-03 22:23:12

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2916 2019-10-03 22:25:16

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2917 2019-10-03 22:25:53

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2918 2019-10-03 22:26:48

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2919 2019-10-03 22:28:20

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2920 2019-10-03 22:28:29

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

Board footer