0:00:24
all right welcome back everyone another
0:00:27
day another weekend more specifically
0:00:31
a one and a half hour live stream of
0:00:33
build break and fix for you guys
0:00:36
so for all of the people who are new
0:00:38
here we are lower coders
0:00:40
we are streaming every day from 9 30 pm
0:00:45
till 10 30 on weekends and 11 on week
0:00:50
10 30 on weekdays until 11 on weekends
0:00:54
yesterday we worked on
0:00:56
validation uh of rest api sorry our
0:01:03
then we went ahead and fixed a
0:01:06
github error which we were facing so
0:01:09
i'm pretty sure i remember we fixed it
0:01:13
that means we have
0:01:18
correct code into def and we have to
0:01:20
other version of our correct code into
0:01:22
dev branch as well
0:01:24
so yeah this is my co-host zen zen how's
0:01:29
i'm very okay how are you doing you're
0:01:31
right you're good very good
0:01:34
for fixing the github
0:01:38
um yeah i can't wait
0:01:44
thinking about that because um i had a
0:01:47
bit of free time today so i thought that
0:01:50
i might work but then i was
0:01:54
no i want to do with
0:01:57
okay as well so i just left here on that
0:02:02
from the chair it's been a pretty good
0:02:05
day um so shall we get started on to
0:02:12
yeah i'm just gonna do that now here we
0:02:16
i think we can just um go to
0:02:27
will remind you what we did yesterday
0:02:29
and today's years as well
0:02:35
a branch which had our middleware to dev
0:02:40
and today we go ahead and
0:02:44
compare the branches which is the
0:02:47
current version of def
0:02:50
um 29th august version of maine
0:02:55
cool uh thanks for their reminder and um
0:03:00
our twitch channel is causing some
0:03:03
problems because it's not being set
0:03:11
i'll go ahead and check what's happening
0:03:13
there right yeah if you can that'd be
0:03:15
awesome uh in the meanwhile i'll just
0:03:18
focus on this code
0:03:21
so scrumble enhancement
0:03:25
okay it looks like we are live on twitch
0:03:29
why do stream yards say we are not
0:03:33
it doesn't say we are not live it just
0:03:35
says we are having some trouble or
0:03:39
i'm pretty sure if you go on twitch
0:03:41
right now you can see us live
0:03:43
okay that is fine no problem at all i'll
0:03:46
just get rid of this error then
0:03:50
i can see on my end
0:03:58
um this is the main branch so what we
0:04:04
why might do is get rid of this folder
0:04:07
in entirely because this is not doing
0:04:17
i'll just i'll just
0:04:22
and it was on the 29th of um july isn't
0:04:26
yep 29th of july remove references there
0:04:34
for this one or this one
0:04:38
yeah take this one
0:04:47
gonna see that click on click on this
0:05:05
it will get cloned that's it i'll just
0:05:17
from the enhancements already exist
0:05:21
uh you already have the same um i know
0:05:23
um i'll just do it here
0:05:42
that one and i'll just
0:05:59
all right that one is there
0:06:07
it's in applications that one
0:06:11
where would this be not um
0:06:15
branch you just cloned on vs code
0:06:18
yeah that's what i'm gonna do now
0:06:27
from the actually why don't i just copy
0:06:39
so now we're going to compare
0:06:42
repo to our other repos in it
0:06:52
i trust all this yeah i trust myself
0:07:08
gonna play around with that one i'm
0:07:11
i haven't done this um comparing of the
0:07:14
branches before have you
0:07:22
so to compare two branches they should
0:07:24
be in the same depository
0:07:27
does that make sense
0:07:33
right oh okay so this won't work
0:07:40
uh how will it work if these two bran
0:07:46
enhancement is on on another location
0:07:48
and the other one is in the other
0:07:52
wait is there what
0:07:55
it's not in another location
0:07:58
it's just at the different
0:08:02
i mean they are technically the same
0:08:07
if you do a git pull now and see dev in
0:08:10
this in this repository the one you just
0:08:14
so if you see dev that should be our
0:08:25
so you you're saying
0:08:28
you know how we must
0:08:33
i just want to see if that's our updated
0:08:50
okay what do you have
0:09:08
gave from the same
0:09:12
it's says that it's switched to a new
0:09:15
branch which is dev
0:09:18
but we already have a branch called dev
0:09:22
can you do a good branch and see what's
0:09:27
it will bring them now because it's
0:09:34
you can revert the change right
0:09:39
yes it's a brand new copy of this repo
0:09:58
how about if we instead of cloning it we
0:10:01
download the zip file instead
0:10:10
all right first of all i'm gonna get rid
0:10:13
this because i don't need it
0:10:22
i'm sending you a link and this is how
0:10:26
okay thank you for that
0:10:36
and i'm just gonna get the little this
0:10:44
just a random page that's hitting my
0:10:48
hand again and again
0:10:51
all right private chat
0:10:58
can you open it in front of us as well
0:11:00
yeah i would just bring photos
0:11:10
far as yours right so
0:11:14
we've got a good patience
0:11:17
um right so if you look there we go
0:11:20
you have to go in the current dev
0:11:23
version and put the link of the remote
0:11:39
why the old main version one not the ah
0:11:45
when you say bro remote branch you mean
0:11:51
version at the point where
0:12:01
what i'm gonna do is open up that
0:12:09
enhance it scrambler
0:12:17
uh that's done okay and then
0:12:20
open this in the code all right
0:12:24
it's definitely my habit to charge
0:12:36
okay mine starts so it'll probably last
0:12:42
okay i'll close all the
0:12:44
things that we don't need
0:12:51
and i'll zoom in a bit as well
0:13:02
yep that's good enough
0:13:18
dev and then i need the remote
0:13:29
just point one thing
0:13:34
not this one remote branch
0:13:47
it might be just a comment
0:13:51
let me control that
0:13:52
let me check if this works
0:14:05
well i'm doing everything at the moment
0:14:09
for the first time so
0:14:11
correct me if i do anything
0:14:15
actually me i haven't put the wait what
0:14:22
okay function that one
0:14:29
hello okay so it's
0:14:31
showing all every single as in
0:14:35
changes line by line
0:14:38
wow can we open vs code i'll just see
0:14:40
how you can do it in vs the same thing
0:15:00
i'll send you the link
0:15:24
ah there we go perfect that's exactly
0:15:27
on the left side there's a get icon that
0:15:33
by clicking on this one double click on
0:15:36
so but we can do this part
0:15:47
you need to run get deaf i guess that's
0:15:52
is it okay i will do that
0:15:57
let me just read again by clicking the
0:16:03
you can see the good difference on two
0:16:05
sides oh he's just
0:16:10
master origin master okay
0:16:13
yeah so do that and now do this
0:16:23
branch merge prices
0:16:28
create branch rebase
0:16:41
this probably isn't how
0:16:45
viewstar repository no
0:16:48
this is not what we want
0:16:54
how to actually what might do um
0:17:31
um how to merge specific
0:17:35
to get uh guitar coins allows you to
0:17:40
cherry pick only the commits you want
0:17:42
from another branch ah here we go
0:17:49
cherry pick it it basically
0:17:52
allows us to only pick the
0:17:55
commits we want from another branch but
0:17:58
would be our main branch
0:18:03
yeah so pull down the branch
0:18:08
use your ui or pull it down uh-huh i'm
0:18:11
gonna use my command line
0:18:14
get back into the brain
0:18:24
get back into the branch you're merging
0:18:28
you'll likely do okay so um we are
0:18:37
no we emerging to death
0:18:40
so by everything you mean everything in
0:18:44
the comment of 29th august um
0:18:50
yes if it appears to be right we're
0:18:52
gonna merge into dev
0:18:53
okay so everything on the commit 29th of
0:18:58
july has to be merged into dev cool
0:19:02
yeah or you can what you can do is
0:19:04
um you can commit the changes like you
0:19:07
can get merge them
0:19:10
you know how after gift merging it shows
0:19:13
changes and if you don't want them you
0:19:22
you know how yesterday we compared files
0:19:24
when we were get merging
0:19:32
even if you do a git merge you can not
0:19:35
like you can unstage it so if you just
0:19:37
want you can just do a git merge and we
0:19:46
sign is and on the dev branch i just
0:19:49
adjust to give merge
0:19:53
not the god of the
0:20:03
okay cool let's do that then um
0:20:09
this is this this commit that we want to
0:20:14
merging to death so i'll do get merge
0:20:24
go back and get merged
0:20:30
already up to date
0:20:43
middleware uh why is this therefore
0:20:49
script i'm just gonna check if his
0:20:52
change is already here
0:20:54
in the dead branch although i highly
0:20:59
yeah it's good to confirm
0:21:06
do you wanna run this code and see if
0:21:07
it's adding the note
0:21:14
okay yeah we could do that i guess
0:21:42
server well done zayn you are the best
0:21:57
uh what am i doing
0:22:07
go and get off the coke get off the coat
0:22:10
come on via coding now
0:22:20
now it will come up
0:22:35
come on come on come on
0:22:40
why doesn't it go now
0:22:45
your notifications
0:23:04
thing must be turned off
0:23:07
pretty sure this is
0:23:09
why strong is not going
0:23:14
no no you have to do one more you have
0:23:16
to do two more go up
0:23:20
uh after this one as well
0:23:24
or else it won't append in the url
0:23:31
save it and run it again
0:24:03
definitely not there
0:24:24
all right i'm gonna just press clear
0:24:27
right um i need to come back
0:24:37
why don't we just copy and paste
0:24:39
everything from that script
0:24:44
comment that's exactly that way
0:24:48
that's exactly what we don't want to do
0:24:51
we kind of want to do it the right way
0:24:56
i mean that's that's easy but like the
0:24:58
whole point is learn to go back to
0:25:06
so we merge okay uh hang on a minute we
0:25:15
am i even doing it properly i don't
0:25:17
think i am to be honest i'm not sure
0:25:19
what you're doing though like what are
0:25:26
difference with the
0:25:29
commit so a branch to a commit or commit
0:25:34
but instead of using
0:25:37
one i think i'm using this number
0:25:40
which might be the problem
0:25:52
also it's into another link
0:25:58
yeah i'll just check in a minute
0:26:05
you to separate the file revision files
0:26:08
which link did you send me
0:26:22
how to compare two different branches in
0:26:35
here's a step-by-step guide
0:26:39
source controls search and compare
0:26:42
compare differences
0:26:45
okay i think we will need that so i'll
0:27:02
why don't source control repositories
0:27:18
i'm not getting the option
0:27:20
no i'm not getting the option for that
0:27:23
all i'm getting is source control and
0:27:26
then what one need to do
0:27:33
source control which i have already
0:27:38
search and compare
0:27:41
so apparently i don't really have all
0:27:44
comment branches slashes
0:27:48
i think i need to add
0:27:52
an extension probably
0:27:59
um it's called i said oh so shoot
0:28:06
right yeah that's the extension that i
0:28:09
need right yeah lens
0:28:14
all right install this and see how it
0:28:17
goes supercharging
0:28:21
can you do a favor and compare
0:28:27
dev and main do i get def of dev and the
0:28:42
i mean oh we can't get it side by side
0:28:50
okay never mind then uh we just need it
0:28:53
side by side and it'll be so much easier
0:29:07
i want to check which one is it
0:29:13
yeah we definitely need that extension
0:29:17
that extension does this side by side
0:29:24
so yeah you should probably go ahead and
0:29:27
yeah i'm just gonna install that
0:29:30
there's another extension called git
0:29:34
which does that but if that doesn't work
0:29:35
we can get to that
0:29:45
install okay so i'm gonna go out of
0:29:49
this code and come back again
0:30:06
have you got water for yourself
0:30:10
i have a bit of um
0:30:26
that one initialize re repo
0:30:30
oh there's another way
0:30:33
you can go to your git config file and
0:30:36
change the difference tool to vs code
0:30:40
but let's try this first
0:30:44
the font the folder card open doesn't
0:30:47
have a get repo what
0:30:51
why doesn't he have a get repo
0:30:54
are you in the client
0:30:58
no i mean the repo itself and it it is a
0:31:05
see if i do ls minus a
0:31:08
your folder is here
0:31:13
why is this thing ah
0:31:18
loading up still yeah
0:31:33
comment search and compare
0:31:38
don't need you anymore
0:31:40
compare the references
0:31:43
so compare references
0:31:50
uh we need death branch
0:31:57
and we need to completely put the
0:32:00
reference like a whatever the reference
0:32:03
of the branch was pretty sure they'll
0:32:06
remove sockets yeah
0:32:13
boys 17 friends changed
0:32:28
trying to do this my first ever time
0:32:33
we might have slowed down a bit
0:32:48
uh six or four guys delete backhand no i
0:32:54
forget about that i had to commit
0:32:57
we don't want that one
0:33:00
when you compare dev over with
0:33:11
why do i keep coming there
0:33:19
five four nine bfa call
0:33:22
okay so we are comparing that one with
0:33:27
if i'll change ah here we go
0:33:34
click on the file and then it'll
0:33:45
all the middleware
0:33:50
we didn't have middleware then so
0:33:53
that makes sense yeah
0:33:57
which one the left one is
0:34:02
i need the script dot
0:34:06
js because that's where all the things
0:34:09
you're in i had one right now
0:34:12
i think that'll be in before
0:34:29
yeah oh it going ahead
0:34:38
you must be in that one delete
0:34:41
fixing the browser
0:34:46
to be the latest branch or there you go
0:35:15
and which is this one
0:35:25
i'm gonna have to go back
0:35:32
where's the client oh there it is yeah
0:35:36
yeah so home home and index are coming
0:35:42
js isn't even showing
0:35:51
that one see this part
0:35:57
can you compare the
0:35:58
current main and see
0:36:00
i think we're not using the tool right
0:36:04
probably yeah that must be the reason
0:36:08
um so what did you want to do
0:36:11
can you compare it with the current main
0:36:13
devin the current main
0:36:15
search comment compare reference
0:36:23
and the current main is it which is this
0:36:29
yeah that must be it
0:36:33
okay that one i can minimize
0:36:36
actually i want to minimize this one
0:36:42
behind ahead to commit
0:37:08
choosing in the incorrect way to be
0:37:16
there must be somebody um behind
0:37:45
you need to explain what that name is
0:37:49
um we have someone new over here
0:37:57
also don't try to pronounce the name
0:37:59
it's gonna take a while so
0:38:06
we are building a announcement on the
0:38:09
current version of open source project
0:38:11
called scramblers here
0:38:13
so we aim to add um persistent storage
0:38:16
to it but right now we are
0:38:21
in the midst of a github heist
0:38:26
we're trying to fix some
0:38:29
a bit of mess around the branches
0:38:35
watch us do that as we
0:38:37
go and explain what's happening
0:38:39
so oh hang on a minute
0:38:44
comment number seems a different one as
0:38:50
yeah i'll just try this one instead
0:38:54
and see what this does
0:38:57
also it compares comets not branches
0:39:02
that makes more sense
0:39:08
right i think i misunderstood the
0:39:15
instead of the branch we need to compare
0:39:20
okay so if that's the case then let's go
0:39:28
latest comment from there
0:39:31
uh if you write there will or it will
0:39:33
always take the latest comment
0:39:36
okay cool i didn't know that
0:39:41
coming back to this
0:39:50
for the follow really appreciate it
0:40:15
to the reference to compare with the
0:40:25
so this is seven digits isn't it
0:40:29
this is seven digits as well
0:40:35
so this is the latest one
0:40:41
don't want the latest one i need the
0:40:47
this is the comment right so
0:40:50
yeah where are you from d4d if you're
0:40:56
this implementation
0:41:19
numbers have changed oh here we go
0:41:22
boy oh boy yeah open up it was a
0:41:27
parent that we need we needed to use
0:41:34
that's the code there
0:41:38
did it we didn't have to copy anything
0:41:44
d4d is from sri lanka thanks that's nice
0:41:54
yeah and then it's from the uk
0:42:05
comment this piece of code
0:42:11
so so everything related to sockets
0:42:17
so okay cool i don't need to figure out
0:42:27
like two different places in a
0:42:32
oh why do we need to do that
0:42:45
yeah just one file
0:42:47
yes yeah that's right
0:42:51
do you wanna compare oh yeah actually is
0:42:53
is it just one file
0:42:55
which is different or is it something
0:42:59
right so by the icons i'm not entirely
0:43:04
i think plus and minus means that it's
0:43:06
been modified and then add
0:43:15
i think the plus with the green means
0:43:16
the file is totally new
0:43:30
ah here we go perfect
0:43:38
index.html so i'm guessing that
0:43:51
this is the cc c e
0:44:00
and so we are comparing
0:44:04
i just wanna make sure
0:44:07
we are comparing the comet
0:44:15
radios it's not really there
0:44:21
would have thought that one
0:44:23
side is out in that branch and once side
0:44:31
what you just opened wasn't the comment
0:44:34
number was that was just the
0:44:45
you need to go into comments
0:44:48
in the dev branch yeah and go on the
0:45:05
com it says comparing dev with d55 c7 b2
0:45:10
which i would say is comparing that so
0:45:15
when you compare um
0:45:21
it assumes there is a latest comment of
0:45:26
if you write dev yeah then i'm i i guess
0:45:30
it's taking the latest
0:45:33
interesting you want to write the
0:45:41
i think what we should do is
0:45:45
compared by comets
0:45:50
i'm going down with that one
0:46:06
d4d are you a developer as well or are
0:46:11
um technological background
0:46:25
a five four nine bfa
0:46:32
breaking three compare
0:46:39
do you study or something
0:46:43
so d4d knows css then
0:46:54
nice it's another repo has a micro
0:47:01
commented that one okay
0:47:05
i just realized what d4d's name means
0:47:10
you need to tell a look
0:47:22
um so if i do commit by that one
0:47:36
wanna oh nice yeah um so what kind of
0:47:40
stack are you aiming to learn d4d
0:47:45
backhand no that's not the one
0:48:02
three nine zero one a five six
0:48:11
five six yet that's the one one
0:48:14
and the one with a five four nine bfa
0:48:32
okay so now i'm comparing the two
0:48:39
thirteen files changed
0:48:44
so d40 is aiming to learn uh maven stack
0:48:48
i'd imagine v is the view.js
0:48:51
um if it helps we are working in a
0:48:54
express environment as well
0:49:10
six seven eight nine ten
0:49:29
right apparently it doesn't do in that
0:49:33
what are we trying to lose then
0:49:36
what i just did was i wanted to compare
0:49:43
i wanted to compare the comments
0:49:47
that branch which wasn't
0:49:49
let's comment here and then from the
0:49:52
master ah i just realized what it was
0:49:59
by just explaining you
0:50:07
three nine zero one eight five six
0:50:11
on a minute just give me a few minutes
0:50:15
yup i think your time is good
0:50:22
so i want to compare
0:50:44
five six and i wanna compare it with
0:50:49
the one in the master
0:50:53
in the main which would be
0:50:57
from the 29th of august
0:51:00
all right turning on the
0:51:17
this is our latest
0:51:19
dev and this is our
0:51:28
let's see if i get the
0:51:32
script.js no it's not there
0:51:35
so d4d we have work divided
0:51:39
so zen works on the back end and i'm
0:51:41
working on the middleware
0:51:43
but we encountered this github bug
0:51:48
i thought it will be great that then
0:51:52
tries to fix it but it's a team effort
0:51:55
um we both are kind of
0:51:57
giving you sellers ideas to fix it
0:52:03
i don't think i'm choosing the right
0:52:08
well what could be wrong
0:52:15
just wanna roll back me into that
0:52:19
i got a minute just give me two seconds
0:52:23
if nothing works out we can always roll
0:52:28
no no no i wanna take the hard road
0:52:33
okay i need my sticky notes
0:52:42
well why does this keep coming up i
0:52:58
ev that's a bit small but it's fine over
0:53:02
here here we go sir
0:53:08
come on come on dude come on sticky nose
0:53:12
that's good yeah right
0:53:15
okay and the comet that i actually
0:53:29
okay that's actually not
0:53:38
that's not the comment number this is
0:53:40
the comment number
0:53:48
then the dot comes up
0:53:52
like the really huge commitment
0:53:59
wait have you tried it
0:54:01
yes i have already all right okay but we
0:54:14
okay i'm gonna shift that one to another
0:54:28
and then i wanna compare it with
0:54:33
but three nine zero one five six is not
0:54:41
why is it not comment number
0:54:45
i am i'm missing something here again
0:54:52
see you're seeing three five
0:54:56
is not a comet number
0:54:58
let's see what the latest dev says
0:55:16
yesterday when we merged no wait one
0:55:20
this is a commit from nine days ago
0:55:22
yesterday we merged
0:55:24
you didn't push it that's why that's
0:55:30
yesterday you merged
0:55:32
just saying i didn't push it in the dev
0:55:38
ah if that's the camera i'm really
0:55:43
i'm pretty sure you didn't merge i mean
0:55:45
the last the comment is nine days ago
0:55:54
we just spent one hour
0:55:58
that's all good just incredible
0:56:01
zayn i'm proud of you
0:56:03
i am very proud of you we need more
0:56:15
already up today and now if i go back to
0:56:31
fixing that branch to be the
0:56:33
latest branch yeah this is the one
0:56:36
commented yesterday
0:56:40
right thanks man for picking that up
0:56:43
otherwise we would have spent
0:56:46
two hours on this and soon
0:56:48
not go anywhere okay
0:56:59
pretty sure script.js should come up now
0:57:06
so what was it against zero eb55
0:57:17
fixing that branch and compare with
0:57:24
um was that number again
0:57:27
you need to copy it
0:57:35
yes that's the one
0:57:42
17 files committed
0:57:56
that's interesting
0:57:58
i'm pretty sure it doesn't take that
0:58:07
and let's have a look with that as well
0:58:18
i don't want to take any chances now
0:58:24
was that the one ebf
0:58:52
i don't think that will work again
0:58:58
um i'm just gonna check
0:59:05
if what i'm thinking is right
0:59:17
alrighty if i see seven b two and they
0:59:20
should give us the script five as well
0:59:24
yeah eighteen changes that looks
0:59:31
okay cool so now we need to figure out
0:59:34
uh way to merge this file
0:59:46
if you just merge it and unstage the
0:59:48
other files that's the same stuff
0:59:50
also i guess you do a git add
0:59:59
do a git checkout to that
1:00:02
place in the branch
1:00:04
get checkout and the number a b whatever
1:00:15
yeah oh sorry do a git switch i'm so
1:00:23
checkout might make that branch so
1:00:30
let's switch to main first
1:00:34
your local changes oh okay cool that's
1:00:42
all right um i'm gonna do one thing and
1:00:45
then get rid of all the
1:00:48
changes that we made early on
1:00:54
yeah yeah that's fine
1:00:59
know what the changes were so i don't
1:01:05
discard this as well delete file don't
1:01:08
really care about that okay cool
1:01:15
and then now it will
1:01:22
and put the number or the parent number
1:01:29
okay let's do a check out here
1:01:32
but that would probably
1:01:33
create the branch that's what so let's
1:01:36
try switching first
1:01:42
what was the number
1:01:47
all right i don't think it's
1:01:52
yeah let's try it it's fine um
1:01:56
branches are back to it it's expecting a
1:01:59
comment so i would think that what the
1:02:02
best course of action
1:02:05
figure out the way to merge this file
1:02:10
they didn't that branch
1:02:18
i mean we probably can't merge one file
1:02:21
but like what we can do is we can um
1:02:25
get merge the two branches and just
1:02:38
we can get merged the two branches which
1:02:43
and we can only stage the script.js file
1:02:47
unstage all the other ones
1:02:52
okay cool right right
1:02:56
how do we get merged then that's all
1:03:05
you so we are merging the dev into main
1:03:11
you need to merge that version of main
1:03:18
ah so the other way around
1:03:30
and then get merge
1:03:37
so it's called conflicts
1:03:41
right so we need to do these conflicts
1:03:57
because i think i just merged the
1:04:10
no no i didn't merge it
1:04:13
um i'm still in the process of
1:04:16
doing the conflicts but i think what i
1:04:24
the latest coming of the main branch
1:04:27
into dev which wasn't the case
1:04:31
shouldn't have been the case hang on all
1:04:33
right you can report that
1:04:36
until unless you push
1:04:40
yeah yeah for sure
1:04:53
uh how'd you refer my that's already
1:04:56
pushed no okay undo merge
1:05:03
garden fan that's a good lamb
1:05:13
this guy gave me a wrong commander
1:05:28
um just continue i'm sorry i'm talking
1:05:37
each yeah we probably need this and get
1:05:39
check or develop you might my branch
1:05:42
so if we did this then we need to
1:05:45
to revert to the previous comment
1:05:48
our merge comment yeah here we go
1:05:50
so we need this one
1:05:56
no get revert that that didn't really
1:06:04
reverting is not possible because you
1:06:06
have unmerged files okay
1:06:14
i have a feeling it didn't work because
1:06:18
it didn't merge because um i still have
1:06:22
comments so what i'm
1:06:34
and then just to get merged and then
1:06:48
this is not the one i wanted i wanted
1:06:56
let's go back and just go back
1:06:58
oh here we go i've already i'm already
1:07:09
get merged this one let's see if that
1:07:12
works all the i had in doubt it
1:07:16
yeah existing because exam because of
1:07:19
another most common
1:07:21
it's not possible all right
1:07:23
cool i need to merge all these first and
1:07:26
then continue because i've already done
1:07:29
no no we can't do that um
1:07:33
so in order to revert to the previous
1:07:36
one as in in order to revert the merge
1:07:40
of which has already been done locally
1:07:47
complete that process first and then
1:07:54
undo a merge con the conflicted merge
1:08:00
can you do a git merge minus minus abort
1:08:12
all right yeah perfect yeah that did it
1:08:18
and now if i do this
1:08:20
comment to this one already up to date
1:08:24
like okay say for i go
1:08:27
i think you have to uh add that file
1:08:34
in the add that file
1:08:36
so you know how when we merge
1:08:44
it's done or already have a look
1:08:50
commented out i'm just gonna
1:08:53
uh run this and see if we can actually
1:09:01
why am i putting them in
1:09:03
uh um it's simple listed we hope
1:09:13
you're still sleeping
1:09:20
monday night at the moment
1:09:23
and i'm doing a lot of
1:09:29
i'm thinking in that way at the moment
1:09:32
because my head is already hurting to be
1:09:38
you're not a junior dev anymore so you
1:09:43
why do you think i'm not complaining
1:09:47
because i'm actually paying
1:09:49
for my own actions at the moment
1:09:57
i'm gonna just do that
1:10:03
test and see if this works which
1:10:08
come on come on set free
1:10:13
ah it's not gonna work obviously oh yeah
1:10:18
those things are commented here
1:10:24
and there's one down
1:10:43
all right let's do that
1:10:59
and we can add the notes
1:11:03
wow well done zayn i'm proud of you not
1:11:25
um try opening it in safari
1:11:30
i don't think i have got safari have i
1:11:33
yeah apple so you have support yeah
1:11:39
that's how you can tell i never use
1:11:50
for some reason my partner really likes
1:12:00
is it the safari safari or the internet
1:12:04
the internet safari girls
1:12:09
it was a joke by the way
1:12:14
oh you didn't write home.html
1:12:20
dude it's hard to concentrate on on a
1:12:28
we can call it a night early on if um if
1:12:33
no no no i'm gonna make sure this issue
1:12:46
come on safari come on help me out here
1:12:58
this doesn't work on
1:13:02
did you put it right
1:13:06
i'm just gonna copy and paste it here
1:13:23
do you want bit wooden
1:13:33
that's interesting
1:13:38
okay you know what i'm gonna do open up
1:13:54
it could be the cash or something
1:13:55
because it did the same for me
1:13:59
that's fun thinking as well
1:14:16
he gives because he told
1:14:19
me i'm just going to check if his
1:14:23
if he's giving the same arrow
1:14:45
doing here what could be they should now
1:14:48
that's the question
1:14:53
when was this working then
1:14:58
what do you mean when was this working
1:15:01
at what point in the project was the
1:15:06
note adding functionality working
1:15:12
when he did the commit
1:15:19
actually hang on man now i'm gonna go
1:15:21
back to all of his files and see
1:15:26
if i actually missed anything to
1:15:36
that's right you commented yeah
1:15:38
try and copy paste once and see if if it
1:15:43
all right i can do that
1:15:47
actually not from here i don't want it
1:15:50
to do it from here bring all the all
1:15:52
than all the numbers as well
1:16:03
corners copy and paste this no
1:16:24
pretty sure there's a copy option
1:16:29
there has to be and it might just yeah
1:16:32
click on edit and do ctrl a ctrl c hmm
1:16:39
all right that's 14
1:16:43
more minutes we need to get this working
1:16:46
then come on internet come on help me
1:16:49
out here i've gone i've commissioned to
1:17:10
i don't think we took the entire file
1:17:14
yeah it looks like it
1:17:17
i have a feeling the merge actually
1:17:25
must be the reason as well
1:17:27
yeah let's try this at least see if it
1:17:32
okay this is there
1:17:45
okay go back there
1:17:51
don't need this one
1:17:59
come on baby girl give me some
1:18:02
i mean i need your love i need you to
1:18:13
so that apparently isn't the case
1:18:18
that apparently isn't the case
1:18:20
what's not the case
1:18:24
copy and paste thingy and then
1:18:27
trying it that doesn't work either
1:18:30
but did you try it
1:18:35
oh i didn't see that
1:18:46
are you having a look now
1:18:57
that goes in there
1:19:04
can you send me the entire code like the
1:19:07
current file zipped up
1:19:14
yeah like what this is maybe on slack or
1:19:17
or wherever you feel
1:19:27
no send me the zip like the zip to file
1:19:32
okay right okay hang on a minute
1:19:43
and i'll try running it on my end
1:20:05
i don't want to cut
1:20:07
don't want to do that
1:20:22
okay um how do you
1:20:27
literally i knew that
1:20:38
not gonna do that where's
1:21:07
ah come on vs code come on
1:21:18
and there you go i've sent it to you
1:21:23
and i'm gonna get rid of this copy here
1:21:35
all right i'll share my screen
1:21:41
let me know if you can see my screen
1:21:44
no yes but i'm going to be yes now i can
1:22:09
is this the one did you name it script
1:22:13
oh i by that i meant the entire project
1:22:20
thought you meant just a file
1:22:25
why does he want the file to be
1:22:27
compressed and then send
1:22:31
and then all right cool
1:22:39
work your brain up work your brain work
1:22:41
you better work your brain
1:22:54
all right workspace
1:22:58
navigate to there and compress
1:23:02
well it might take a bit long
1:23:10
not that long i would say
1:23:21
okay and it's coming to you
1:23:34
i'll just open slack give me a second
1:23:39
loading at the moment so you you might
1:23:41
have to wear a bit
1:23:47
okay zen's gone i think
1:23:50
he closed his browser by mistake
1:23:54
but that's fine he sent me the file
1:24:00
cool i got the file
1:24:13
that's all good welcome back
1:24:27
same as my girlfriend
1:24:37
no it's not easy it's just messy
1:24:40
uh personal preference
1:25:10
thought it was just that much
1:25:31
let's do it on safari
1:25:46
okay that's interesting
1:25:52
don't think it'll be fixed by the night
1:26:01
we really need to figure out what's
1:26:03
causing this you know
1:26:08
it doesn't even give any any um
1:26:14
things to work on isn't it
1:26:17
yeah that's so let's see
1:26:20
remove references when that was causing
1:26:22
errors so firstly it's not giving any um
1:26:34
working as he described
1:27:18
turning into it now
1:27:28
running and lose to a star
1:27:46
and i'll run the server now
1:28:00
you might want to go back into h
1:28:02
industrial html because i don't think
1:28:08
js is imported there
1:28:15
in his version as well now it's not
1:28:19
should i try clearing my cash i don't
1:28:26
how do i clear the cash in safari
1:28:32
google that um hang on i'll just cool
1:28:38
pair cash in safari
1:28:51
safari tap clear history and then
1:29:02
try and find a shortcut for you
1:29:32
does that work okay now it comes up
1:29:36
try it and try it on yours i can see the
1:29:42
yes try clearing your cache
1:29:45
uh wait i'll now what are this i'll open
1:29:47
the current version and see
1:30:21
is it working for you
1:30:48
final opening code
1:31:15
uh no in the right folder probably
1:31:39
what oh it's already in use
1:31:43
so you're already using the
1:31:46
alcohols but trying to
1:31:53
right it could be this one yeah it's
1:31:56
this one sorry that's my man
1:32:02
come on boy you got this
1:32:06
come on e and i'll delete my history as
1:32:17
come on you can work
1:32:26
so how was it working before
1:32:29
it was working on his on his comment
1:32:33
ah on his commit so what
1:32:39
what are we doing wrong on ours
1:32:43
we need to figure it out
1:32:47
let's call it the night right now
1:32:49
tomorrow is monday so
1:32:51
oh we might want to be prepared for
1:32:58
um it's fine we'll we'll come back to it
1:33:03
even like people working like two they
1:33:05
do take like three four hours working on
1:33:11
yeah let's do that we'll come back to
1:33:14
him on monday now because
1:33:18
you have got some other things to do as
1:33:26
yeah we tried a lot of different things
1:33:29
um pretty sure we'll be able to do it
1:33:32
and join in tomorrow guys to see what
1:33:38
thank you guys and wherever you are
1:33:41
in the world um sri lanka or
1:33:45
wherever have a good morning afternoon
1:33:48
or night but if you're in melbourne then
1:33:50
have a good night and we'll see you back
1:33:53
here tomorrow with the same time same
1:33:55
place and same task so
1:34:00
yes guys cheers bye
