<peterm6881>
hmm.....ive mananged to make a mistake, the orange pi image became the same size as the lichee pi one. What the heck does Merge branch mean, looks like ive done something by accident
<Xogium>
peterm6881: think of it as merging 2 branches of a tree or 2 different trees into one
<Xogium>
so you effectively turned the lichee pi into a orange pi repo by making a fusion of those 2 branches
<Xogium>
or more likely a cross
<Xogium>
how did you do this ?
<peterm6881>
its difficult to see how i did that
<Xogium>
I suppose you might have done that through the github interface, unless you did some merge tricks with git or git-extras, but the word merge would have made you wonder whatever that was
<peterm6881>
i actually feel sick, because all I was trying to do was bring the orange pi repo up to date
<Xogium>
that can be canceled, I'm sure. We just need to figure out whatever you did
<Xogium>
so you don't do it again
<peterm6881>
it will be some crossover of the notes, so im going to create 2 separate notes, one for the lichee pi and one for the orange pi. Becuase I do want to keep the orange pi up to date, in case we never get this new board made
<Xogium>
sure, seems sensible
<Xogium>
but anyway the procedure is literally the same as with the lichee in this case
<Xogium>
hmm
<peterm6881>
yeah agreed, the only difference is the patch
<peterm6881>
and the names of the directories
<Xogium>
so
<Xogium>
can you remember what you did ?
<peterm6881>
but obviously i need to keep each walkthrough completely separate, because this morning im thinking whatever happened isnt really possible
<peterm6881>
no
<Xogium>
that's gonna make it hard to figure what you did
<Xogium>
so you learn from it and don't do it by accident again
<peterm6881>
im assuming the lichee repo is as was
<Xogium>
no
<Xogium>
you merged the content of the orange pi repo into it
<Xogium>
so you practically override part of things
<peterm6881>
its obviously far too easy to make a massive mistake
peterm6881 has quit [Remote host closed the connection]
<Xogium>
yes
<Xogium>
but luckily for you, it is also very easy to revert such a mistake
<Xogium>
git remember every thing you did, every commit you've made, every commit you've undone, everything is saved in what's called the reflog
<Xogium>
do you think you could give me ssh access to your machine so I can work on fixing this ?
<Xogium>
your local git repo has the history of this change, so it makes it very easy to make it disappear like it never existed
peterm6881 has joined #Speedsaver
<peterm6881>
hey
<peterm6881>
ive created separate guides for lichee and orange, would you like to check them?
<peterm6881>
basically its a start from scratch how to, for me
<Xogium>
sure
<Xogium>
you might want to pastebin them
<Xogium>
or something
<Xogium>
otherwise that's gonna flood the channel like mad
<peterm6881>
hmm... how does that work?
<Xogium>
you go on a pastebin website or similar and you paste your stuff in and it generates a link to it so other people can consult the thing you pasted
<peterm6881>
check your email
<Xogium>
that's an idea too
<peterm6881>
let me know if you can read them
<Xogium>
peterm6881: seems good to me, however I usually type a message for the update like
<Xogium>
git commit -m "board/speedsaver: bump kernel to 5.19.2."
<Xogium>
you can do that also
<peterm6881>
Ah but isnt that done automatically in the text file it launches, I simply edited that with words to that effect
<peterm6881>
but yeah, I'll change it
<peterm6881>
thanks Xogium
<peterm6881>
you see where I have git commit -a
<peterm6881>
could that just be git commit -a -m "board/speedsaver: bump kernel to 5.19.2"
<peterm6881>
would that work
<Xogium>
I wouldn't use -a
<Xogium>
I don't understand what that option actually does
<Xogium>
-a, --all Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected.
<Xogium>
ah
<Xogium>
hmm
<Xogium>
I think it lets you do a global git add or rm without specifying the files. Which means its redundant if you do git add
<Xogium>
besides, git add is safer, git commit -a might add a file you didn't want to add in that commit
<Xogium>
so lets say you modify the readme and a script somewhere in board directory, and for some reason you want to do 2 separate commits with that, doing git commit -a wouldn't let you do that, it would grab every modified file
<peterm6881>
ok so I changed the line from git commit -a to git commit -m "board/speedsaver: bump kernel to 5.19.2"
<peterm6881>
happy enough with that?
<peterm6881>
dunno where i got git commit -a from
<Xogium>
5.19.2 being a template of course
<Xogium>
but yeah
<peterm6881>
great, we're good to go. This should take a lot of the pressure off you
<peterm6881>
i can take care of all the boring day to day updating and testing
<peterm6881>
both building now, walk through appears to be accurate
<peterm6881>
in other words no typos
<peterm6881>
yeah we're in good shape Xogium
peterm6881 has quit [Remote host closed the connection]