0:00:24
hello and welcome everyone to another
0:00:28
weekday episode of little break and fix
0:00:31
today's mondays so we're gonna stream
0:00:34
for one hour which means we're gonna
0:00:36
stop streaming at 10 30 p.m
0:00:39
and to all of the people who are new
0:00:41
here we are lower quarters we stream
0:00:44
from 9 30 melbourne time every day
0:00:48
so we are working on a project currently
0:00:53
persistent storage to the current open
0:00:56
scrambler.ca um yesterday we
0:01:03
bug or um not exactly a bug but like
0:01:08
figured during the weekend
0:01:10
and yesterday we spent the whole time
0:01:13
trying to fix it and today we are really
0:01:17
um we are probably gonna
0:01:19
show you guys how to fix a github
0:01:24
overwritten merger quest
0:01:27
yes let's just get started what do we
0:01:32
britain thanks for that okay um so we
0:01:36
just i'm just gonna share my screen
0:01:38
review and we can get started
0:01:50
i'm just gonna open up the
0:01:55
uh yeah this is the one
0:02:01
we were at the point that
0:02:04
we think that we did the uh we
0:02:09
did a bit for hotfix
0:02:12
script.js and it isn't just copied and
0:02:19
that branch but it wasn't working isn't
0:02:26
take it off from there
0:02:30
yeah we need to compare it and see
0:02:37
just gonna go in the history
0:02:43
or if nothing comes to it we need to we
0:02:47
might need to roll back main to that
0:02:50
time and then compare it
0:02:58
right right right right
0:03:01
let's try like another 15 20 minutes
0:03:05
um all right we'll go roll back me into
0:03:07
29th of august on july sorry
0:03:12
all right yeah we could do that
0:03:16
so first of all we need to
0:03:29
since this was all
0:03:32
so this would probably only show
0:03:35
the part that's been changed isn't it
0:03:52
i'm just thinking because we did this
0:03:55
yes today as well but it didn't really
0:04:09
you know what i'm thinking
0:04:14
we can just roll the master branch um
0:04:20
back to this until this commit because
0:04:23
whatever we have got after that commit
0:04:26
is just mixture of broken and working
0:04:38
so you need to do get branch sorry get
0:04:40
reset minus minus hard and the
0:04:43
um name of the parent
0:04:46
that's how you do it
0:04:57
so come to that one
0:05:00
where is my vs code
0:05:03
um i would come to
0:05:21
okay so middleweight has changes
0:05:24
we don't need to worry about the
0:05:27
middle over here because we know exactly
0:05:34
um we just need this code actually
0:05:39
we don't even need this code now is
0:05:44
no it's got changes
0:05:48
there we go and this one can
0:05:52
no no no come back
0:06:11
and now if we try and
0:06:23
i think that's done
0:06:25
and now we need to get
0:06:33
minus minus and heart is small
0:06:39
yup and the name of the parent
0:06:50
now a branch main off that why can't
0:06:55
why i can't see it
0:07:04
now we can do get stages
0:07:08
um then you yeah you might wanna turn
0:07:12
uh it's coming again
0:07:22
all right nothing to commit get pulled
0:07:32
updating oh no no no no no no no no
0:07:35
well that's fine okay exactly what we
0:07:40
there into that commit
0:07:43
yeah and that's what we want right on
0:07:47
okay yeah i see what you mean now
0:08:01
quick right can you do a good branch
0:08:06
and also can you zoom in a bit please
0:08:10
ah i'm slacking again
0:08:28
um the application
0:08:31
and see if adding notes work
0:09:10
all right let's see
0:09:15
uh this is not gonna work
0:09:19
because we commented out
0:09:23
oh no it the other
0:09:25
this doesn't have the middleware
0:09:34
oh okay i thought that was in all right
0:09:54
all right there's one more in the what
0:09:57
am i doing what am i doing
0:10:01
go down body oh go up oh boy
0:10:09
just a bit up here line 32
0:10:16
sure that's the one
0:10:19
yeah no that's not the one
0:10:26
there you go that was the one
0:10:28
oh yeah cool all right
0:10:47
references no stream no i don't need
0:10:51
don't need that either
0:11:03
here we go and we hard refresh by
0:11:09
and then do i said seven this time
0:11:16
and then hope for the best plan for the
0:11:19
no it's not it doesn't work still no no
0:11:24
that must be something
0:11:26
clear your cash yeah
0:11:36
i'm gonna face the same pain now
0:11:42
you're already passionate huh you want
0:11:44
me to experience that pain
0:11:48
all right i'll do it especially for uk
0:11:51
use password managers
0:11:58
i will uh but first i need to do that
0:12:03
comma but yeah that works
0:12:06
just type cache on the search part
0:12:10
i really don't want to do this
0:12:15
my heart is being really fast at the
0:12:20
that's the sacrifice you have to make
0:12:22
okay hang on a minute
0:12:25
no don't don't do all the time
0:12:28
i'm not gonna do all
0:12:32
cookies and other side ah ah here we go
0:12:35
chest images and files
0:12:40
go on wait why did you unshare yours oh
0:12:46
all right zen is gone
0:12:53
let me just check on him what happened
0:13:08
just waiting for him to reply
0:13:21
fix this thing for sure at this time
0:13:28
let's say and come by until
0:13:31
i'll take you guys through the
0:13:36
myself one second he applied
0:13:44
that's amazing that kind of cs
0:13:47
um then if you can see us uh we can't
0:13:50
hear you or see you now you're not in
0:13:58
that's fine we'll go to github and see
0:14:08
the last change was made
0:14:22
two days ago to these two branches
0:14:27
okay let's see what
0:14:29
kind of desktop says
0:14:45
all right waiting for it to open
0:15:11
do i wanna pull master
0:15:24
okay see the history of this branch
0:15:46
because the branch
0:15:50
i think i need to fetch
0:16:13
only one file was changed
0:16:25
still here i don't think so
0:16:30
i think sam doesn't like us that much
0:16:41
if zen is not coming right now i'll go
0:16:46
continue the good work
0:16:55
scrambler enhancement
0:17:09
so what i'm going to do is
0:17:27
again so that i don't have to
0:17:30
play with my current changes
0:17:36
there is my pointers
0:17:47
all right um including the repository so
0:17:50
that i don't have to
0:17:54
change the current
0:17:56
uh version of my middleware
0:18:00
so as you guys know the problem which we
0:18:02
were facing was relating to
0:18:06
override to the main
0:18:26
on origin and i'll do how many branches
0:18:35
there's our cute little dev branch as
0:18:39
okay wq to exit run
0:18:46
so you want to do a get diff between
0:18:55
i really forgot how to do a good diff
0:18:58
um firstly i'm gonna try running the
0:19:08
and of course it started to run on my
0:19:12
it's gonna go to safari because i don't
0:19:16
looks like i don't have any other
0:19:17
options so i'm gonna go to chrome
0:19:26
um yes so let's do
0:19:34
i know why that's happening
0:19:36
so we forgot to uncomment
0:19:41
from our middleware
0:19:50
right okay this is already uncommented
0:19:53
so now that i've uncovered these i'll
0:19:55
start the server again
0:20:04
let's do a hard refresh
0:20:22
okay there must be a reason why that's
0:20:29
so i wanna keep this file open i'm just
0:20:32
gonna copy the contents to a new file
0:20:39
i'm gonna switch to my dev branch where
0:20:45
correct version of the current
0:21:06
ready line number 16.
0:21:10
compare line number 60 here
0:21:14
okay that looks fine
0:21:17
yeah let's try running this one
0:21:21
oh i don't want your messages
0:21:36
hey looks like zan is restarting his
0:21:43
that's interesting
0:21:47
okay that should not happen
0:21:50
let's see if the same thing is happening
0:21:54
current version of scrambler enhancement
0:21:57
and looks like it was a good decision to
0:22:05
this version wouldn't probably work as
0:22:14
oh boy i know why that's working
0:22:17
got to close this one all right
0:22:20
now that should be fine
0:22:40
start finding the main index file
0:22:44
that is interesting
0:23:01
all right um looks like we are
0:23:04
having this error which is not able to
0:23:09
um i'll go ahead and try it again
0:23:14
i'm back now can you hear me it's trying
0:23:18
no they can't hear me
0:23:20
oh hey zen how's it going
0:23:25
i think the k uh i think the
0:23:27
clearing the cash did a bit of a problem
0:23:32
yeah you cleared it all in
0:23:34
yeah so when you were clearing the crash
0:23:36
like i was like no no no don't do it
0:23:38
don't do it and you just like
0:23:43
yeah that's my lesson all right did you
0:23:46
hear me like saying no no no
0:24:00
to the stream cool so where were we
0:24:03
i need to open up everything again
0:24:06
you were clearing the cache
0:24:08
okay so which one shall i
0:24:14
are you on the clear cash screen yeah
0:24:17
i've gone through there
0:24:20
oh come on a minute
0:24:26
this is really weird
0:24:31
i shared my screen
0:24:32
yes i have oh you haven't that's me oh
0:24:44
same thing open on my end as well so
0:24:47
i'll see what i'm already showing the
0:24:58
brilliant now we're back
0:25:04
this is what he was
0:25:06
doing so i'll just
0:25:09
and go to this one open this one up
0:25:40
so in that command just want to check
0:25:43
you uh that may had
0:25:54
i was suspecting as well that the
0:25:56
comment did not have with their file
0:26:04
back to scrum block
0:26:26
you have to go to the comet on that
0:26:48
interesting it doesn't even have that
0:26:54
you need to put in when you did a git
0:27:18
okay look at this one look at this stack
0:27:23
i'll send it to you in private chat
0:27:26
this will tell you exactly how to reset
0:27:48
that's exactly what we did
0:27:51
oh so it's saying that
0:27:57
tag branch and then the comment as well
0:28:01
that's interesting
0:28:03
i haven't done this before
0:28:05
right yeah let's try this
0:28:42
if you wish to commit that's this so
0:28:44
they return country also points to the
0:28:56
make a copy of the branches uh-huh
0:29:00
yeah this is exactly what we did
0:29:03
reset your current branch to the
0:29:06
desired comment with
0:29:09
replace this one with that comment that
0:29:12
they want to go back to
0:29:16
get reset how long is it the letters
0:29:25
where he has written get reset minus one
0:29:29
this three six nine ten
0:29:33
and how long was ours
0:29:57
six eight ten this is the one
0:30:02
are you sure just because it's 10 um
0:30:06
to this oh we can try it though
0:30:11
try this and see what this one comes up
0:30:19
yeah try that try that
0:30:34
why am i thinking a
0:30:44
okay five four nine before a three three
0:30:49
now i remember references that one
0:30:56
no no no i'm not gonna do a good pool
0:30:59
because it's already on that stage at
0:31:02
the moment i think that's where i went
0:31:05
wrong as in after that
0:31:12
brought me to them
0:31:18
okay that makes sense
0:31:22
so i'll just do that and i'm gonna i've
0:31:25
got two of them open here now
0:31:28
is it all right middle there isn't there
0:31:29
that's cool oh perfect okay so
0:31:32
now we need to test
0:31:37
notes are actually working
0:31:40
yep so just run the button command and
0:31:44
you already clear your cash so i should
0:31:53
i thought you would just suffer with the
0:31:54
netflix password but you did
0:32:03
i haven't got any um
0:32:12
yeah but like even if you open like your
0:32:14
banking stuff it's 8 000 yeah yeah yeah
0:32:20
i understand what you're in there yeah
0:32:23
then you have to type in all the
0:32:25
passwords and use usernames again um
0:32:34
keep an eye on them that'll be
0:32:37
okay hey andre how's it going i tried
0:32:41
get gui client that get extension it's
0:32:44
much easier than cli
0:32:48
were trying them but
0:32:56
wouldn't say hates
0:32:58
that's a strong word man come on
0:33:00
i would say just don't like it
0:33:03
gen zen doesn't use
0:33:09
yeah i but i use it i i like it and it's
0:33:17
fork for mac oh yeah yeah we can focus
0:33:22
cd clients here we go and then
0:33:27
on the server to test it
0:33:34
how's your work coming along andre
0:33:40
ah that's not gonna work
0:33:44
no no hang on i'll just try this
0:33:48
oh yeah log down is really bad like uh
0:33:51
now we have the curfew as well i was
0:33:53
literally just thinking um i'll go to
0:33:57
um coals so there is a coals open till
0:34:01
near my place so i was like i'll go to
0:34:03
coals after the stream i was like oh
0:34:06
yeah that's that's not happening today
0:34:09
that's not getting it
0:34:12
all right perfect so
0:34:15
now it's all working now so all i need
0:34:18
to do is can you do a good dip for
0:34:24
the main end dev now
0:34:26
i'll do a get merged
0:34:28
with main endeavor isn't it okay but
0:34:32
said do a good dip first because we i
0:34:36
just want to know that only one file
0:34:42
merge main into depth don't merge the
0:34:46
click this file we don't need this one
0:34:49
we don't need any of the backhand
0:34:52
stopping as that's on here in other
0:35:01
but um did you enjoy working for mom i
0:35:04
mean yeah i guess you said that it
0:35:06
should be a good balance so
0:35:08
um the balance is gone
0:35:15
okay compare references so we are
0:35:18
comparing the main branch with the
0:35:25
cool so it's behind two
0:35:28
comments yeah that's fine
0:35:40
so all these means that they have been
0:35:47
that's it that sam files or crap but yes
0:35:51
i don't really know
0:35:52
even the other ones are back and stuff
0:35:54
even if we merge it we don't add it yes
0:35:57
yeah technically it's just um home and
0:36:00
index just a bit changed but there is a
0:36:06
the script file isn't here again
0:36:20
if you compare it the other way around
0:36:22
would it make any difference if you
0:36:30
learning this tool as well so
0:36:34
do that as well um so
0:36:38
death to me whatever you did last time
0:36:41
just do the vice versa of that oh
0:36:46
i think we need to push the main first
0:36:50
because that still shows three weeks ago
0:36:56
so i think there might be the problem i
0:36:58
need to push these changes no no wait
0:37:00
wait then then one second
0:37:02
then don't push it to main create
0:37:04
another dummy branch just get checked
0:37:06
out from main to that new branch
0:37:10
uh we'll compare it to that branch
0:37:14
don't push anything to me
0:37:20
create another main branch
0:37:23
now just create another dummy branch
0:37:25
we'll just delete it but just any dummy
0:37:29
yeah and you have to do minus b
0:37:39
all right that's done and
0:37:45
what exactly are we trying to do here
0:37:50
we don't want to push anything to main
0:37:54
we're gonna put main back to its state
0:37:57
when you made the merge
0:38:00
and then we gotta compare dummy to dev
0:38:03
because it has all the changes in men
0:38:08
so then means that we compare the dummy
0:38:21
after pushing it actually try it right
0:38:23
now i think it will work
0:38:29
nana don't push it don't push it do
0:38:36
know i need to first understand
0:38:39
what we're trying to do here okay so the
0:38:42
whole aim right now is to not push
0:38:44
anything to main um if you push
0:38:46
something to main right now it will go
0:38:48
back to 29th july state but we just want
0:38:51
to do it locally so what we're going to
0:38:53
do is we're going to create another
0:38:55
branch called dummy which will have the
0:38:58
changes from 29th july to the dummy
0:39:01
and we're going to compare dummy to dev
0:39:04
and we're going to leave maine as it is
0:39:06
because no comments yeah yeah i mean
0:39:12
yeah exactly okay cool
0:39:16
now i think i'm with you so what i'm
0:39:20
do a hard on that one
0:39:33
i need to compare the dummy to them now
0:39:40
oh that's three weeks ago as well okay
0:39:46
exactly what we want right the three
0:39:49
one the 29th july one
0:40:14
i think you should try comparing dev to
0:40:16
dummy right now you're comparing dummy
0:40:22
let's see how it works the other way
0:40:35
heck why am i doing good
0:40:50
these i had fixing branch
0:40:53
no i don't need this one
0:40:59
so that's the middleware
0:41:01
yes so it's in depth
0:41:03
that's in the branch
0:41:09
yeah so what we do is changed
0:41:12
and see the script file is there or not
0:41:16
what that's not right i think the script
0:41:23
oh we do the parent
0:41:25
i know why it's not changed because we
0:41:27
copy and pasted it
0:41:31
copy and pasted what and where the
0:41:34
script file to dev remember
0:41:44
no but then i undo all the
0:41:47
under all the changes from
0:41:50
that first and then checked out
0:41:53
do you wanna make it once do you wanna
0:41:54
check um yeah you can check let's check
0:42:13
um then then one second can you open the
0:42:16
script file in the current one okay
0:42:29
um just copy the contents of this one to
0:42:32
a new file and we'll delete the file
0:42:37
i have no idea what's
0:42:41
weird doing but yeah i'll just follow
0:42:48
yeah just do ctrl n
0:42:53
yeah now paste it here
0:42:56
yeah now go back to dev
0:43:01
do do again check out today
0:43:08
now open the script file again
0:43:13
yeah now let's compare if there's any
0:43:20
so this is the code which you're seeing
0:43:23
um is for deaf and the one the new file
0:43:26
we made was the code in dummy
0:43:31
so that's why we created a new file
0:43:35
so we're just basically comparing
0:43:37
one file into different branches
0:43:47
would be because it's becoming a bit
0:43:50
a bit too complicated
0:43:56
my simple approach would
0:43:59
be there why not because we're learning
0:44:06
just do the push or in the main branch
0:44:10
so that branch we know
0:44:13
that is on the exact
0:44:20
on the exam comment that we want it to
0:44:25
i mean it is right it is three weeks ago
0:44:29
yes but it's not pushed into the remote
0:44:32
branch the remote master branch it's
0:44:38
we need to just check it locally first
0:44:40
why do you why do we need to push it to
0:44:42
main why can't we just
0:44:46
because if you if you push it to main
0:44:50
then we can simply
0:45:03
we can do it right now as well locally
0:45:09
without actually pushing any code
0:45:14
changes shows saying they're not really
0:45:18
appearing here at the moment
0:45:21
i mean no it is right the branches on
0:45:24
its three weeks ago state
0:45:30
locally yeah the thing is you copied the
0:45:34
script yes and i'm pretty sure it's the
0:45:39
if you go and look um
0:45:41
the socket stuff is
0:45:58
actually i'm gonna download that
0:46:02
quick because that's really helpful
0:46:09
so does this software like compare to
0:46:15
text folders files everything
0:46:19
oh i'm pretty sure we can get something
0:46:28
there's a tool called text compare
0:46:50
checks compare was it
0:46:54
yes actually tried diff checker
0:47:01
let me just do this
0:47:05
to be sure because i'm very familiar
0:47:08
with this one as well
0:47:11
all right i mean it's just pasting the
0:47:13
code i mean it's just pasting the text
0:47:15
it shouldn't really
0:47:19
make any difference to that
0:47:21
um it's called diff checker
0:47:55
yep that's the original one ah i painted
0:48:00
okay and the one from
0:48:06
that branch is there
0:48:26
pretty sure you pasted yesterday and
0:48:33
if you're doing compare references
0:48:35
script file is the same
0:48:42
and just um can you repeat that
0:48:45
um yesterday when you copied the stuff
0:48:51
script file and go to dev
0:48:53
you can undo the changes so that's why
0:48:56
now when we compare references
0:49:01
yeah and that's why that's happening
0:49:04
um right right that's right right right
0:49:08
what you can do is you can go ahead and
0:49:15
all application let's do that so okay
0:49:24
already up to date
0:49:31
you shouldn't say that
0:49:39
your brand is already up to date
0:49:58
that be up to date
0:50:01
or i could merge them and dive into
0:50:20
the order of the branches also makes a
0:50:24
difference apparently um
0:50:31
gonna test it on to dummy now
0:50:34
and then if this works then we can
0:50:37
transfer everything to
0:50:55
um it was right there yeah
0:51:01
i mean we should always write it it's
0:51:02
good practice for a finger as well yeah
0:51:07
i tried to like write most of this stuff
0:51:24
all right there we go
0:51:33
okay that wouldn't work because the
0:51:35
comments have been there
0:51:38
the comments are there
0:51:56
right line 50 something it's already
0:52:15
hopefully we can finish this
0:52:21
before this works right now and we're
0:53:40
would you mind comparing um dummy and
0:54:08
dummy and then dev right
0:54:12
these both have two
0:54:20
i'm having a feeling that
0:54:23
the dummy branch had
0:54:26
something in the index file which was
0:54:28
making it happening
0:54:33
yeah compare compare dev and main ones
0:54:50
ago and go on 17 files
0:54:55
see what changes are made in the index
0:55:14
okay this is just a form formatting
0:55:17
thing don't worry about that yeah yeah
0:55:23
so you commented this
0:55:27
ah here we go that's the problem is it's
0:55:30
not picking up script
0:55:40
the right one is the dev branch and the
0:55:52
i don't know how to tell now um because
0:56:02
the head of um dev was o dot
0:56:12
that's the show right this is main and
0:56:20
index file in main is working and
0:56:24
x file in the main
0:56:29
ah yes you know why
0:56:35
the script file isn't imported
0:56:38
it's not uncommented but in dev it's
0:56:42
commented that's why it's not picking up
0:56:44
the changes um then go ahead and go to
0:56:47
dummy and just do it manually for now
0:56:51
it's line number 40 39.
0:57:04
yep that's probably something
0:57:11
kindly we were missing this
0:57:18
really smooth things that
0:57:23
huge impacts at the end
0:57:31
i mean you uni really taught us um get
0:57:38
focus on it um yeah and like when i
0:57:42
worked as well it it was a
0:57:47
like getting detailed
0:57:48
as in at the moment
0:57:51
to be honest i'm learning a lot about
0:58:02
that has done the trick so now what i'm
0:58:04
gonna do is merge this one back into the
0:58:10
merge the dev back into main
0:58:12
yeah we'll test it on depth first and
0:58:14
then yeah of course
0:58:20
you have to go there first
0:58:29
these comments here
0:58:39
that's interesting
0:58:42
so it transferred the
0:58:44
um modifications to david
0:58:53
that's what i'm seeing at the moment
0:58:56
oh oh wait because they both have the
0:58:59
same head yeah that's why that makes
0:59:00
sense ah okay right right right yeah
0:59:05
now don't get merged to make sure
0:59:12
uh i'm gonna commit it first and then
0:59:18
no you should just merge it for now
0:59:24
wasn't that the case
0:59:29
you're better than me in the
0:59:36
i'm asking you when i'm trying so um
0:59:39
let's let's try this i guess let's just
0:59:43
if it is already up to date then it's
0:59:48
okay we are imagine
0:59:56
you're in dev right can you check if the
0:59:58
index file has that uncommented
1:00:02
are you sure they have the same head so
1:00:06
yeah line number 39
1:00:09
okay yeah that's fine
1:00:12
okay so now i'm going to just add it and
1:00:17
yeah let's push it to
1:00:26
pushing like don't forget to delete
1:00:29
yeah yeah of course i'm gonna do that
1:00:33
okay that one's there
1:00:39
that one's okay add
1:01:42
you know how to delete a branch
1:01:48
also call grid branch minus d
1:01:56
d and then the branch
1:02:01
really okay cool ah oh wait i learned
1:02:08
okay and now i'll just merge um
1:02:14
wait wait one second actually wait um
1:02:17
before pushing it um
1:02:19
change the head of main to
1:02:29
change the head or you know how the main
1:02:31
file we reset it to 29 july
1:02:39
latest one which was your merge
1:02:49
why do we want to do that
1:02:52
because we want to still because we
1:02:54
didn't make any changes to main
1:02:57
it to override to the previous um
1:03:03
we just want to keep it updated
1:03:10
what i should do is
1:03:14
go to main and then do a give pool for
1:03:17
all the latest do get reset to the
1:03:29
we already fixed it right so we don't
1:03:31
wanna we don't have to go back
1:03:34
last head okay so when you say current
1:03:38
version i assume there's the latest
1:03:41
version is that what you mean yes
1:03:47
the merge you you did that's the latest
1:03:50
and right now our head is on three weeks
1:03:53
ago version yeah so we wanna make the
1:03:56
head to the current version
1:04:02
keep pull on the main branch and isn't
1:04:06
yes you can do that but wouldn't that
1:04:09
change other branches
1:04:12
and you can just do a good reset
1:04:17
and the name of the
1:04:22
so what i was thinking that if we can do
1:04:28
um because the uh the main branch
1:04:32
locally is already on the head that we
1:04:36
no it's not um it's on the older head
1:04:39
we want to bring it back
1:04:43
we just did that to get the code
1:04:47
we don't actually want to roll back like
1:04:49
think of it as production
1:04:51
we fix the error we don't have to roll
1:04:53
back to the 29th july version
1:05:01
now we would do a gift pool on the main
1:05:04
branch so it comes on the
1:05:08
yeah we can yeah we can i'm just
1:05:10
wondering would doing a get pulled
1:05:12
affect the dev branch as well
1:05:19
because we made changes to our dev
1:05:23
will it pull the dev branch back
1:05:25
so i think you should do a kit fetch
1:05:31
we would do what you
1:05:38
i'm not as confident in
1:05:43
i'm not sure about this
1:05:48
the safest way is to do it just do get
1:05:51
reset hard and the latest versions tag
1:06:07
might be a bit different but i just want
1:06:09
to clarify yeah quite that
1:06:15
yes that's important
1:06:17
so when you say get
1:06:21
the first test on the top do you mean
1:06:26
one is yeah now open your code on this
1:06:35
right one second yeah
1:06:38
and you see the six four three e tag on
1:06:47
yeah just to get reset minus minus r to
1:06:54
right okay okay so essentially what we
1:07:00
we have two different approaches to
1:07:03
achieve the same result
1:07:05
yeah no i mean i like get pull is fine
1:07:08
i'm just curious that would it affect
1:07:10
the dev branch as well like would it
1:07:11
pull down yes i wouldn't
1:07:14
yeah exactly so i just don't want to
1:07:15
take a risk to affect the driver
1:07:20
so we would do that
1:07:23
because i'm pretty sure if we do a
1:07:26
certain command on
1:07:29
a certain branch it would only affect
1:07:34
nothing we can try it we can take a risk
1:07:36
i mean i don't mind
1:07:40
it's been too many days on this one i
1:07:44
don't wanna i don't wanna risk it
1:07:47
uh e3f six one zero okay
1:07:53
okay head is now there already
1:08:07
wait we didn't test the dev though we
1:08:22
okay we have halfway
1:08:25
yes we have conflicts
1:08:27
did it did the merge fail or did the
1:08:30
merge was successful
1:08:34
all right okay so let's do a
1:08:36
um merged roll back
1:08:40
and then we can resolve the conflicts
1:08:56
it was getting rewarded
1:08:58
oh you can do a um what do you call it
1:09:04
okay which one do you want to use
1:09:12
do any one of these
1:09:21
okay we can't go back apparently
1:09:25
i think we did the wrong come on just
1:09:27
give me one second
1:09:30
oh sorry it was good words minus
1:09:44
okay so you wanna test uh the dev branch
1:10:04
but that's good that we were able to fix
1:10:10
it costed us over time
1:10:13
yeah i think that's worth it exactly
1:10:21
let's open up this bad boy now
1:10:40
in our wrong folder again
1:10:54
you didn't start the server
1:10:57
uh am i too fast for myself
1:11:23
all right does it work
1:11:30
yeah oh just we tested properly um can
1:11:33
you check the end point as well
1:11:35
and see if z11 got there
1:11:57
there's gonna be a lot of boards
1:12:03
i can see that and
1:12:20
um do it once more and
1:12:24
put something discreet i might have
1:12:27
no like insert another board
1:12:33
it's running right
1:12:43
all righty let's give it a go
1:13:11
ah it doesn't come up all right
1:13:18
okay let's come back to it
1:13:20
i'm gonna okay i'm gonna just uh push
1:13:29
actually no um dev is actually not
1:13:33
but it's fine it's dev anyway so
1:13:38
we can push this because it's only
1:13:40
because it's deaf and we can come back
1:13:44
yeah let's put that
1:13:50
actually just bear with me
1:13:55
what am i doing no no i'm trying to
1:14:06
okay that one goes there all of them
1:14:12
i'm just thinking if it's the chorus
1:14:17
i'm gonna kill myself
1:14:28
should we ever look
1:14:30
okay yeah actually
1:14:34
um prevent the page from going forward
1:14:36
by commenting those three lines in
1:14:40
this is really big too honestly
1:14:49
line 17 and line 20.
1:15:08
if it's the course here this is the last
1:15:18
please don't go okay
1:15:32
one two three four
1:15:47
yeah now we can come back tomorrow all
1:15:49
right yeah i don't want to do this
1:16:03
okay i'm gonna push this keep commit i
1:16:08
they haven't been any changes
1:16:10
so i'll just push it okay
1:16:22
all right all right
1:16:27
thanks a lot guys for um
1:16:31
if you're still on this journey
1:16:33
with us thank you very much um
1:16:37
actually have done about 30 minutes over
1:16:46
time but it has been pretty pretty
1:16:51
so yeah join us back here if you want to
1:16:54
see how do we fix this new bug which is
1:16:59
isn't posting so we'll be working on
1:17:07
yeah do you want to add
1:17:10
something to the k
1:17:11
yeah um i just want to thank andre he's
1:17:14
still here um he's still watching us
1:17:17
since 10 p.m so thank you andre andre
1:17:20
ashley wants to know where's your green
1:17:23
yeah so that's a really good question
1:17:26
i actually tracked it today and um
1:17:30
it's estimated or approval is 26th of
1:17:43
i'll lay in a as soon as it comes and
1:17:47
thank you very much for staying here
1:17:49
with us really appreciate your um
1:17:53
encouragement and support
1:17:54
yeah for sure cool um i guess that's all
1:17:58
for today that was pretty good we
1:18:01
error finally and yeah let's come back
1:18:04
tomorrow and see where this goes
1:18:06
that's fantastic have a good night guys
1:18:10
andre and hope to see you
1:18:13
tomorrow have a good night
1:18:16
good night cheers thanks guys cheers bye
