http pastie org p 1jtkDJYq7PVCZ0nfI6PfCj | Home Assistant | Page 1

gusty sky Mar 12, 2023, 1:22 PM

#

What does git diff --name-only --diff-filter=U show

gusty charm Mar 12, 2023, 1:24 PM

#

It showing me blank rows
https://imgur.com/GzMZCEt

gusty sky Mar 12, 2023, 1:24 PM

#

Will it let you git rebase --continue?

gusty charm Mar 12, 2023, 1:25 PM

#

[core-ssh config]$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add

gusty sky Mar 12, 2023, 1:26 PM

#

git rebase --skip, since you've deleted it and that's all the commit contained

gusty charm Mar 12, 2023, 1:27 PM

#

[core-ssh config]$ git rebase --skip
CONFLICT (modify/delete): www/tmp/snapshot_living_room_sub.jpg deleted in HEAD and modified in a84da5b (config files on 02-03-2023 04:00:00). Version a84da5b (config files on 02-03-2023 04:00:00) of www/tmp/snapshot_living_room_sub.jpg left in tree.
error: could not apply a84da5b... config files on 02-03-2023 04:00:00
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a84da5b... config files on 02-03-2023 04:00:00

#

that conflict again

#

should I abort?

gusty sky Mar 12, 2023, 1:27 PM

#

I don't think it'll let you

gusty charm Mar 12, 2023, 1:27 PM

#

yeah because we already tried that

gusty sky Mar 12, 2023, 1:28 PM

#

Try running the same git rm command again

gusty charm Mar 12, 2023, 1:29 PM

#

ok

#

[core-ssh config]$ git rm www/tmp/snapshot_living_room_sub.jpg
rm 'www/tmp/snapshot_living_room_sub.jpg'

gusty sky Mar 12, 2023, 1:30 PM

#

does continue give you the same error

#

Since it looks like you actually added that folder to your gitignore, you should be able to skip those conflicts, so if you get that again, skip this again

gusty charm Mar 12, 2023, 1:30 PM

#

git rebase --continue ?

gusty sky Mar 12, 2023, 1:30 PM

#

right

gusty charm Mar 12, 2023, 1:30 PM

#

[core-ssh config]$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add

gusty sky Mar 12, 2023, 1:30 PM

#

yeah skip it again

gusty charm Mar 12, 2023, 1:30 PM

#

so just git add ?

gusty sky Mar 12, 2023, 1:31 PM

#

git rebase --skip

gusty charm Mar 12, 2023, 1:31 PM

#

[core-ssh config]$ git rebase --skip
CONFLICT (modify/delete): www/tmp/snapshot_living_room_sub.jpg deleted in HEAD and modified in 1b10a6d (config files on 03-03-2023 04:00:00). Version 1b10a6d (config files on 03-03-2023 04:00:00) of www/tmp/snapshot_living_room_sub.jpg left in tree.
error: could not apply 1b10a6d... config files on 03-03-2023 04:00:00
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1b10a6d... config files on 03-03-2023 04:00:00

gusty sky Mar 12, 2023, 1:31 PM

#

skip again.... for the ones that come up w/ www/tmp, you don't want to preserve any of that anyway

gusty charm Mar 12, 2023, 1:32 PM

#

[core-ssh config]$ git rebase --skip
CONFLICT (modify/delete): www/tmp/snapshot_living_room_sub.jpg deleted in HEAD and modified in 6788343 (config files on 04-03-2023 04:00:00). Version 6788343 (config files on 04-03-2023 04:00:00) of www/tmp/snapshot_living_room_sub.jpg left in tree.
error: could not apply 6788343... config files on 04-03-2023 04:00:00
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6788343... config files on 04-03-2023 04:00:00

#

same

#

should I do it again?

gusty sky Mar 12, 2023, 1:32 PM

#

yeah

gusty charm Mar 12, 2023, 1:32 PM

#

[core-ssh config]$ git rebase --skip
Auto-merging automations.yaml
CONFLICT (modify/delete): www/tmp/snapshot_living_room_sub.jpg deleted in HEAD and modified in 0ae2bfd (config files on 05-03-2023 04:00:00). Version 0ae2bfd (config files on 05-03-2023 04:00:00) of www/tmp/snapshot_living_room_sub.jpg left in tree.
error: could not apply 0ae2bfd... config files on 05-03-2023 04:00:00
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0ae2bfd... config files on 05-03-2023 04:00:00

#

how many times should It be?

gusty sky Mar 12, 2023, 1:32 PM

#

well you're on march 5th, so a few, it seems

gusty charm Mar 12, 2023, 1:33 PM

#

[core-ssh config]$ git rebase --skip
error: The following untracked working tree files would be overwritten by merge:
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4971.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4980.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4995.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f5023.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4971.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4980.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4995.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p5023.jpg
www/upcoming-media-card-images/plex/Recently_Added_TV/f4979.jpg
www/upcoming-media-card-images/plex/Recently_Added_TV/p4979.jpg
Please move or remove them before you merge.
Aborting
hint: Could not execute the todo command
hint:
hint: pick 1276f1402ee9c6e60148cb9cecda1f4892cca8d7 config files on 10-03-2023 04:00:00
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint: git rebase --edit-todo
hint: git rebase --continue
Could not apply 1276f14... config files on 10-03-2023 04:00:00

gusty sky Mar 12, 2023, 1:33 PM

#

are you wanting to commit those plex images

gusty charm Mar 12, 2023, 1:33 PM

#

i don't mind

#

I just don't want those living room images to be public

#

(which I added to the gitignore file)

gusty sky Mar 12, 2023, 1:41 PM

#

If they're easy enough to regenerate, you could remove them. Otherwise, I think you may need to temporarily move those pictures it references to a separate directory

#

actually, renaming both of those directories would probably let you abort the rebase

gusty charm Mar 12, 2023, 1:46 PM

#

I prefer not to touch anymore and deal with those files

#

so If i don't mind commit or not those plex images what command should I type in the terminal next?

gusty sky Mar 12, 2023, 1:49 PM

#

I do believe in the current state, something has to be done w/ those image files

#

It won't let you proceed w/o moving or deleting them

gusty charm Mar 12, 2023, 1:50 PM

#

Manually?

gusty sky Mar 12, 2023, 1:51 PM

#

Right

gusty charm Mar 12, 2023, 1:51 PM

#

the whole www/imgs folder?

#

because it's already removed

gusty sky Mar 12, 2023, 1:52 PM

#

just the plex/Recently_Added_Movies and plex/Recently_Added_TV

gusty charm Mar 12, 2023, 1:52 PM

#

ok

gusty sky Mar 12, 2023, 1:52 PM

#

Those are in www/upcoming-media-card-images

gusty charm Mar 12, 2023, 1:52 PM

#

https://imgur.com/gIUois3

#

Delete directory or just the images?

gusty sky Mar 12, 2023, 1:53 PM

#

No no

#

don't do that in git

#

On your local filesystem

gusty charm Mar 12, 2023, 1:53 PM

#

so how

#

alright

gusty sky Mar 12, 2023, 1:53 PM

#

through the shell you've got open

gusty charm Mar 12, 2023, 1:53 PM

#

(That's what I did with the www/tmp that made all of these problems)..

#

by git

#

git rm www/upcoming-media-card-images/plex/Recently_Added_Movies/f4971.jpg

gusty sky Mar 12, 2023, 1:54 PM

#

Yeah, if you commit from multiple spots, you'll end up running into conflict. The issue compounded because HA was still making new daily commits and wasn't able to push them

gusty charm Mar 12, 2023, 1:54 PM

#

like that?

gusty sky Mar 12, 2023, 1:54 PM

#

no, just regular rm

gusty charm Mar 12, 2023, 1:54 PM

#

ok

gusty sky Mar 12, 2023, 1:54 PM

#

git rm removes it from Git's tracking

#

which you don't want to do

gusty charm Mar 12, 2023, 1:57 PM

#

[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/f4971.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/f4980.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/f4995.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/f5023.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/p4971.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/p4980.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/p4995.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_Movies/p5023.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_TV/f4979.jpg
[core-ssh config]$ rm www/upcoming-media-card-images/plex/Recently_Added_TV/p4979.jpg
[core-ssh config]$

#

ok done, what's now

gusty sky Mar 12, 2023, 1:57 PM

#

git rebase --continue

gusty charm Mar 12, 2023, 1:58 PM

#

[core-ssh config]$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add

gusty sky Mar 12, 2023, 1:58 PM

#

ah, skip again

gusty charm Mar 12, 2023, 1:58 PM

#

haha ok

#

[core-ssh config]$ git rebase --skip
error: The following untracked working tree files would be overwritten by merge:
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4971.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4980.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4995.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f5023.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4971.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4980.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4995.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p5023.jpg
www/upcoming-media-card-images/plex/Recently_Added_TV/f4979.jpg
www/upcoming-media-card-images/plex/Recently_Added_TV/p4979.jpg
Please move or remove them before you merge.
Aborting
hint: Could not execute the todo command
hint:
hint: pick 1276f1402ee9c6e60148cb9cecda1f4892cca8d7 config files on 10-03-2023 04:00:00
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint: git rebase --edit-todo
hint: git rebase --continue
Could not apply 1276f14... config files on 10-03-2023 04:00:00

gusty sky Mar 12, 2023, 2:00 PM

#

hmmm... did it bring those files back?

gusty charm Mar 12, 2023, 2:00 PM

#

how can it do that?

#

I mean I removed them from my files, not from the git

#

https://imgur.com/f3JyXv1

#

I added to the gitignore file www/upcoming-media-card-images so it won't upload them anymore

gusty sky Mar 12, 2023, 2:14 PM

#

I'm not sure exactly then if you've deleted those files yet it's still coming back w/ them existing

gusty charm Mar 12, 2023, 2:22 PM

#

Yeah I deleted them completly by using rm via the terminal

#

Okay it does coming back by using the trakt integration I have...

#

Is there a way to ignore them and let the script work then?

gusty sky Mar 12, 2023, 2:25 PM

#

I don't believe so, since it's wanting to copy files that will overwrite those

#

and the only way to "ignore" them is to remove them

gusty charm Mar 12, 2023, 2:44 PM

#

It just downloads the artwork of the movies/shows that added last to my plex server
https://imgur.com/0TUopXx

#

on the Visual basic studio I can pull/push etc the git, should I try one of the options?
https://imgur.com/fNlwAeG

It's a commit from 2 days ago

gusty sky Mar 12, 2023, 2:52 PM

#

That's the one that it was trying to apply before

#

you can try it

gusty charm Mar 12, 2023, 2:54 PM

#

which one of the options?

#

Yeah this is the main problem in my git

gusty sky Mar 12, 2023, 2:55 PM

#

Does that menu come up when you click continue

gusty charm Mar 12, 2023, 2:55 PM

#

after pressing continue I got this error

#

https://imgur.com/CsXdULY

#

2023-03-12 16:55:46.181 [info] > git rebase --continue [13ms]
2023-03-12 16:55:46.181 [info] Rebasing (18/21)
error: The following untracked working tree files would be overwritten by merge:
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4971.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4980.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f4995.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/f5023.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4971.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4980.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p4995.jpg
www/upcoming-media-card-images/plex/Recently_Added_Movies/p5023.jpg
www/upcoming-media-card-images/plex/Recently_Added_TV/f4979.jpg
www/upcoming-media-card-images/plex/Recently_Added_TV/p4979.jpg
Please move or remove them before you merge.
Aborting
hint: Could not execute the todo command
hint:
hint: pick 1276f1402ee9c6e60148cb9cecda1f4892cca8d7 config files on 10-03-2023 04:00:00
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint: git rebase --edit-todo
hint: git rebase --continue
Could not apply 1276f14... config files on 10-03-2023 04:00:00

and this is on output

gusty sky Mar 12, 2023, 2:57 PM

#

If those fiels keep being recreated I don't think you'll have much luck in proceeding

#

That's the same error that we saw before

gusty charm Mar 12, 2023, 2:58 PM

#

so the only solution that I have is to remove the entire repository in my git and create a new one?

gusty sky Mar 12, 2023, 3:02 PM

#

I wouldn't say that

#

I would try

mv www/upcoming-media-card-images/plex/Recently_Added_Movies www/upcoming-media-card-images/plex/Recently_Added_Movies2
mv www/upcoming-media-card-images/plex/Recently_Added_TV www/upcoming-media-card-images/plex/Recently_Added_TV2
git rebase --skip

gusty charm Mar 12, 2023, 3:03 PM

#

but the integration automatically brings those photos to the first path

gusty sky Mar 12, 2023, 3:04 PM

#

I'd assume after some delay

gusty charm Mar 12, 2023, 3:04 PM

#

ok got nothing to lose

#

let's try

#

➜ /config git:(d4464b9) ✗ git rebase --skip
Removing www/upcoming-media-card-images/plex/Recently_Added_TV/p4956.jpg
Removing www/upcoming-media-card-images/plex/Recently_Added_TV/f4956.jpg
CONFLICT (modify/delete): www/tmp/snapshot_living_room_sub.jpg deleted in HEAD and modified in a84da5b (config files on 02-03-2023 04:00:00). Version a84da5b (config files on 02-03-2023 04:00:00) of www/tmp/snapshot_living_room_sub.jpg left in tree.
error: could not apply a84da5b... config files on 02-03-2023 04:00:00
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a84da5b... config files on 02-03-2023 04:00:00

gusty sky Mar 12, 2023, 3:05 PM

#

🤔 seems like you're possibly past the other error, but back to Feb in commits

#

that's a skippable one

gusty charm Mar 12, 2023, 3:05 PM

#

so git rebase --skip ?

#

➜ /config git:(d4464b9) ✗ git rebase --skip
CONFLICT (modify/delete): www/tmp/snapshot_living_room_sub.jpg deleted in HEAD and modified in 53b0ca9 (config files on 12-03-2023 14:35:55). Version 53b0ca9 (config files on 12-03-2023 14:35:55) of www/tmp/snapshot_living_room_sub.jpg left in tree.
Auto-merging automations.yaml
CONFLICT (content): Merge conflict in automations.yaml
error: could not apply 53b0ca9... config files on 12-03-2023 14:35:55
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 53b0ca9... config files on 12-03-2023 14:35:55
➜ /config git:(d4464b9) ✗ git rebase --skip
Successfully rebased and updated refs/heads/master.

gusty sky Mar 12, 2023, 3:07 PM

#

git status

gusty charm Mar 12, 2023, 3:07 PM

#

http://pastie.org/p/6HTrn6n8DGSHh3ZFB3iRxv

gusty sky Mar 12, 2023, 3:08 PM

#

So... you should be good to git push .... there's still outstanding image changes, but I'd say probably push first to ensure you're good

gusty charm Mar 12, 2023, 3:08 PM

#

without git add . ?

#

just git push ?

gusty sky Mar 12, 2023, 3:09 PM

#

don't need to do that yet, you've already added and committed things

#

just git push

#

that will sync your rebase to github

gusty charm Mar 12, 2023, 3:09 PM

#

/config git:(master) ✗ git push
Warning: Permanently added 'github.com,140.82.121.3' (ECDSA) to the list of known hosts.
Everything up-to-date

#

in the repository i don't see a new commit

#

ok I just ran the automation

#

it worked.

#

Thanks dude!
Is there a way now to remove the recently added _ 2 folders?

gusty sky Mar 12, 2023, 3:11 PM

#

On your last commands you ran... you skipped 2 commits, but the second one actually had your automations.yaml in it

gusty charm Mar 12, 2023, 3:11 PM

#

or just leave them there

gusty sky Mar 12, 2023, 3:12 PM

#

I have a feeling that your automations.yaml may have lost some things

gusty charm Mar 12, 2023, 3:12 PM

#

why you think so?

gusty sky Mar 12, 2023, 3:12 PM

#

Auto-merging automations.yaml
CONFLICT (content): Merge conflict in automations.yaml
error: could not apply 53b0ca9... config files on 12-03-2023 14:35:55

gusty charm Mar 12, 2023, 3:12 PM

#

Where do you see that?

gusty sky Mar 12, 2023, 3:13 PM

#

gusty charm Mar 12, 2023, 3:13 PM

#

yeah looks like it just updated the www folder

#

instead of all the files (sensors.yaml & automation.yaml)

gusty sky Mar 12, 2023, 3:13 PM

#

Potentially it nuked your fish reminder from this morning

#

Is that still there

gusty charm Mar 12, 2023, 3:14 PM

#

Yeah it's in my HA

#

but not in the git

gusty sky Mar 12, 2023, 3:14 PM

#

🤔

#

What's git log say

#

mv www/upcoming-media-card-images/plex/Recently_Added_Movies2/* www/upcoming-media-card-images/plex/Recently_Added_Movies
mv www/upcoming-media-card-images/plex/Recently_Added_TV2/* www/upcoming-media-card-images/plex/Recently_Added_TV

#

That will copy the files we moved out, back

#

It'll probably prompt for overwrite

gusty charm Mar 12, 2023, 3:16 PM

#

commit 4e8ba7bf2dba40dceac1ea99c858625d4cf6be04 (HEAD -> master, origin/master)
Author: root <root@homeassistant.local.hass.io>
Date:   Sun Mar 12 17:11:09 2023 +0200

    config files on 12-03-2023 17:11:09

commit d4464b9cd5aa21e091a676628d91d11e0795399d
Author: Ofir-P <79255941+Ofir-P@users.noreply.github.com>
Date:   Wed Mar 1 02:20:20 2023 +0200

    Delete image directory

commit aad80b779b371ac0b0f478ecc72552ce91b45bef
Author: Ofir-P <79255941+Ofir-P@users.noreply.github.com>
Date:   Wed Mar 1 02:19:39 2023 +0200

    Delete www/tmp directory

#

Ofir-P is when I tried to remove directory from the git..

gusty sky Mar 12, 2023, 3:17 PM

#

Right, yeah that's just what's in your git repo on Github now

#

git push -u origin master

gusty charm Mar 12, 2023, 3:17 PM

#

wait I will do the two mv commands first

gusty sky Mar 12, 2023, 3:17 PM

#

now it's there

#

Yeah, I'm just seeing image changes

gusty charm Mar 12, 2023, 3:18 PM

#

➜ /config git:(master) mv www/upcoming-media-card-images/plex/Recently_Added_Movies2/* www/upcoming-media-card-images/plex/Recently_Added_Movies
➜ /config git:(master) ✗ mv www/upcoming-media-card-images/plex/Recently_Added_TV2/* www/upcoming-media-card-images/plex/Recently_Added_TV
➜ /config git:(master) ✗ git push -u origin master
Warning: Permanently added 'github.com,140.82.121.3' (ECDSA) to the list of known hosts.
Branch 'master' set up to track remote branch 'master' from 'origin'.
Everything up-to-date
➜ /config git:(master) ✗

gusty sky Mar 12, 2023, 3:18 PM

#

There you could do git add .

#

and then your git commit

#

that will add a new commit w/ those changes

#

rm www/upcoming-media-card-images/plex/Recently_Added_TV2
rm www/upcoming-media-card-images/plex/Recently_Added_Movies2

#

So those directories aren't sitting there empty

gusty charm Mar 12, 2023, 3:19 PM

#

before the commit, right?

gusty sky Mar 12, 2023, 3:19 PM

#

right

#

and before the add

#

or re-run the add if you've done it

gusty charm Mar 12, 2023, 3:20 PM

#

/config git:(master) ✗ rm www/upcoming-media-card-images/plex/Recently_Added_TV2
rm: cannot remove 'www/upcoming-media-card-images/plex/Recently_Added_TV2': Is a directory

#

is it like linux that you should do rm -r ?

gusty sky Mar 12, 2023, 3:20 PM

#

yeah

gusty charm Mar 12, 2023, 3:20 PM

#

ok i will try that

#

http://pastie.org/p/5c0SIp2O4GtYIV2yBICJoP

#

I don't see a new commit in my repository; and will it fix the automation.yaml file too?

gusty sky Mar 12, 2023, 3:24 PM

#

You'd have to push to see it show in github

gusty charm Mar 12, 2023, 3:25 PM

#

right, but I don't see any change to the sensors.yaml or automation.yaml

#

and other files that I'm sure they have changed during those 3 weeks

gusty sky Mar 12, 2023, 3:32 PM

#

I think you'll have to pull that from the reflog as the skipped commit was the last one in the rebase and the rebase is completed

gusty charm Mar 12, 2023, 3:33 PM

#

Is it even possible to do that?

gusty sky Mar 12, 2023, 3:33 PM

#

check git reflog

#

There should be history prior to the rebase

gusty charm Mar 12, 2023, 3:34 PM

#

49ebcf6 (HEAD -> master, origin/master) HEAD@{0}: commit: fixed github 12-03-2023 17:21:35
4e8ba7b HEAD@{1}: commit: config files on 12-03-2023 17:11:09
d4464b9 HEAD@{2}: rebase (skip) (finish): returning to refs/heads/master
d4464b9 HEAD@{3}: pull --rebase (start): checkout d4464b9cd5aa21e091a676628d91d11e0795399d
53b0ca9 HEAD@{4}: rebase (abort): updating HEAD
ef94c98 HEAD@{5}: rebase (continue): config files on 10-03-2023 04:00:00
d4464b9 HEAD@{6}: pull --rebase (start): checkout d4464b9cd5aa21e091a676628d91d11e0795399d
53b0ca9 HEAD@{7}: commit: config files on 12-03-2023 14:35:55
c9d2e87 HEAD@{8}: commit: config files on 12-03-2023 04:00:00
c4c5cc1 HEAD@{9}: commit: config files on 11-03-2023 04:00:00
1276f14 HEAD@{10}: commit: config files on 10-03-2023 04:00:00
025c586 HEAD@{11}: commit: config files on 09-03-2023 04:00:00
794bbe0 HEAD@{12}: commit: config files on 08-03-2023 04:00:00
b0b1cf1 HEAD@{13}: commit: config files on 07-03-2023 04:00:00
d4490a3 HEAD@{14}: commit: config files on 06-03-2023 04:00:00
0ae2bfd HEAD@{15}: commit: config files on 05-03-2023 04:00:00

third line?

gusty sky Mar 12, 2023, 3:34 PM

#

53b0ca9 is where we started i think

gusty charm Mar 12, 2023, 3:34 PM

#

ok with this commit number what should I do to merge it or make it appear in my git?

gusty sky Mar 12, 2023, 3:36 PM

#

git reset --hard "HEAD@{7}"

gusty charm Mar 12, 2023, 3:36 PM

#

➜ /config git:(master) git reset --hard "HEAD@{7}"
HEAD is now at 53b0ca9 config files on 12-03-2023 14:35:55

gusty sky Mar 12, 2023, 3:36 PM

#

So, you should have all your changes back, locally now

#

Can you check

gusty charm Mar 12, 2023, 3:37 PM

#

Well locally nothing changed in my automation.yaml

gusty sky Mar 12, 2023, 3:37 PM

#

You sure? Even if you re-open the file

gusty charm Mar 12, 2023, 3:37 PM

#

it looks the same, I had the fish alert from the morning

gusty sky Mar 12, 2023, 3:37 PM

#

ah, alright

#

possibly it never refreshed

gusty charm Mar 12, 2023, 3:38 PM

#

so now should I git add . again?

gusty sky Mar 12, 2023, 3:38 PM

#

no, everything is added at this point....

#

So

#

Options... you could just force push what you have now, which will nuke the two edits you did by hand

#

Otherwise.... you could try a merge instead.... but, I don't know if that will run into any issues

gusty charm Mar 12, 2023, 3:38 PM

#

i don't mind to force push

#

how do I perfom that?

gusty sky Mar 12, 2023, 3:39 PM

#

You'll have to re-do the 2 edits you did outside of this process

#

If you're good w/ that, git push --force origin master

gusty charm Mar 12, 2023, 3:39 PM

#

you mean copy again to temp folder?

#

the plex photos?

gusty sky Mar 12, 2023, 3:39 PM

#

The deletion of www/tmp, etc

gusty charm Mar 12, 2023, 3:39 PM

#

Oh yeah I don't mind

#

But I will do that by command and not by going to git manually, right?

gusty sky Mar 12, 2023, 3:40 PM

#

(It's typically a very bad idea to do a force push to an actual remote repo, just so you're aware)

gusty charm Mar 12, 2023, 3:40 PM

#

Oh

gusty sky Mar 12, 2023, 3:40 PM

#

You could do that from the shell after you're done

gusty charm Mar 12, 2023, 3:40 PM

#

I just want it to show the updated files of the automation.yaml etc..

gusty sky Mar 12, 2023, 3:40 PM

#

I agree, which is why it makes sense to rewrite the history that was pushed

gusty charm Mar 12, 2023, 3:41 PM

#

ok so I'm doing the git push and after that will do a command to remove the folder from my git.

gusty sky Mar 12, 2023, 3:41 PM

#

👍

gusty charm Mar 12, 2023, 3:42 PM

#

rm -r www/tmp ?

gusty sky Mar 12, 2023, 3:42 PM

#

if that's what you want to remove, yup. You'll have to re-add to .gitignore as well

#

ah, looks like it's there already

gusty charm Mar 12, 2023, 3:43 PM

#

yeah it's in there

#

ok, should be good now
I will run the automation to see if automation.yaml gets updated

gusty sky Mar 12, 2023, 3:43 PM

#

I see your updates to sensors and automations on your repo

gusty charm Mar 12, 2023, 3:44 PM

#

sweet

#

Thank you man!!!
by the way, is there a way to improve the automation to a diff text on the description of the commit every time it commits or that's too complicated?

#

because as you can see in my repository it's just saying config files and date, not what has been added/removed

gusty sky Mar 12, 2023, 3:45 PM

#

Right, how would you propose it convey that in the comment message though

gusty charm Mar 12, 2023, 3:47 PM

#

No idea, that's why I ask the professional guy here

#

What is your automation doing? or you don't have a github backup automation

gusty sky Mar 12, 2023, 3:47 PM

#

Nope, I don't push to github. I just have snapshots and a Google Drive backup

gusty charm Mar 12, 2023, 3:47 PM

#

Fair enough

gusty sky Mar 12, 2023, 3:48 PM

#

For an automated add/commit, I can't think of a great way beyond like stuffing the list of files changed, but that doesn't seem helpful. You can easily click the commit message to see the diff log

gusty charm Mar 12, 2023, 3:48 PM

#

I learned my lesson and won't do it manually anymore, just by commands in the terminal 🙂

#

yeah it will be heavily for the description and too long

gusty sky Mar 12, 2023, 3:48 PM

#

Yeah, sorry, I also contributed to it as well. My advice to continue w/ the rebase pull wasn't good and that's where we were stuck for a couple hours

gusty charm Mar 12, 2023, 3:49 PM

#

We fixed it, that's what matters!

gusty sky Mar 12, 2023, 3:49 PM

#

Protect the 🐟

gusty charm Mar 12, 2023, 3:49 PM

#

Thank you sir, appreciate that a lot!

#http pastie org p 1jtkDJYq7PVCZ0nfI6PfCj