boarzVideosClipsStatistics

🎬Finger memory practice

⏪
🎦
⏩
Featured in#️⃣EP 034 - Build Break Fix
AllClipsEpisodesHas Blog PostZainThaneshKartikTorey
🎬
Krunchmaster Kartik
Build, Break & Fix
ZainboarKartikboar
🎬
Killing it
Special Edition: We don't stop until we get our code working
ZainboarKartikboar
🎬
Schooling in brown countries
Build,Break & Fix // Weekend two hour special
ZainboarKartikboar
🎬
Unprofessional Kartik
Build,Break & Fix // Weekend two hour special
ZainboarKartikboar
🎬
Brain Refresh
Build, Break & Fix // Setting a blog using Hugo and AWS Amplify
ZainboarKartikboar
🎬
Finger driven architecture
Build, Break & Fix // Working out Software design
ZainboarKartikboar
🎬
Fast food driven architecture
Build, Break & Fix // Working out Software design
ZainboarKartikboar
🎬
Can't be ashamed if there's never a first version
Build, Break & Fix
ZainboarKartikboar
🎬
Not a uni student
Build, Break & Fix
ZainboarKartikboar
🎬
Can't work, deploying
30 mins of deployment 😠 || 30 mins of coding 🥲
ZainboarKartikboar
🎬
Two points of contact
Today's Broadcast
ZainboarKartikboar
🎬
CORS exclusive lovin'
Today's Broadcast
ZainboarKartikboar
🎬
Sensible policy
Today's Stream
ZainboarKartikboar
🎬
Shoes in mouth
Today's Stream
ZainboarKartikboar
🎬
The code always wins
Buidl Break Fix
ZainboarKartikboar
🎬
Chicken curry in the brown way
Buidl Break Fix
ZainboarKartikboar
▶️
Finger memory practice
Build Break Fix
ZainboarKartikboar
🎬
See you later Kartik
Build Break Fix
ZainboarKartikboar
🎬
Keep your code looking sexy
Today's Broadcast
ZainboarKartikboar
🎬
Echo chamber Zain
Today's Broadcast
ZainboarKartikboar
🎬
And Kartik never got a job again...
Today's Broadcast
ZainboarKartikboar
🎬
Pilot? What even iz dat kind of fing
Today's Broascast
ZainboarKartikboar
🎬
Fish and Chips
Build - Break - Fix
ZainboarKartikboar
🎬
Backup career
Build - Break - Fix
ZainboarKartikboar
🎬
Professional background? Wat even iz dat?
Today's Broadcast
ZainboarKartikboar
🎬
Private mentorship group
Today's Broadcast
ZainboarKartikboar
🎬
Actually good job advice from Zain
Today's Stream
ZainboarKartikboar
🎬
What a classic!
Today's Stream
ZainboarKartikboar
🎬
Uber driver in training
Today's Stream
ZainboarKartikboar
🎬
Viewer burn
Today's Broadcast
ZainboarKartikboar
🎬
Time for a nap
Today's Broadcast
ZainboarKartikboar
🎬
A sniffer of a line
Today's Broadcast
ZainboarKartikboar
🎬
Slow Zain
Today's Broadcast
ZainboarKartikboar
🎬
No single point of failure
Today's Broadcast
ZainboarKartikboar
🎬
Gambling on bad logic
Today's Broadcast
ZainboarKartikboar
🎬
Estimated Time of New-Careers
Today's Broadcast
ZainboarKartikboar
🎬
Fake Nod
Today's Broadcast
ZainboarKartikboar
🎬
Investing in 'the brand'
NEW SETUP!!
ZainboarKartikboar
🎬
Hitting a brick
NEW SETUP!!
ZainboarKartikboar
🎬
Master of the green screen
NEW SETUP!!
ZainboarKartikboar
🎬
Logiclesstech
NEW SETUP!!
ZainboarKartikboar
🎬
Get him to the greenscreen
Today's Stream
ZainboarKartikboar
🎬
Change the digit to a number
Today's Stream
ZainboarKartikboar
🎬
The benefits of pair programming
Today's Broadcast
ZainboarKartikboar
🎬
Xs, the healthy choice
Today's Stream
ZainboarKartikboar
🎬
Xs vs mother
Today's Stream
ZainboarKartikboar
🎬
The beginning of the end of productivity
Today's Stream
ZainboarKartikboar
🎬
Unprofessional Zain
Today's Stream
ZainboarKartikboar
🎬
Blazing fast
Today's Stream
ZainboarKartikboar
🎬
Premature celebratory dance
Today's Stream
ZainboarKartikboar
🎬
Timeline slippage
Today's Stream
ZainboarKartikboar
🎬
Speed coding
Today's Stream
ZainboarKartikboar
🎬
Sorry I dont know that voice
Today's Broadcast
ZainboarKartikboar
🎬
Definition of done
Today's Broadcast
ZainboarKartikboar
🎬
Amway bites
Today's Broadcast
ZainboarKartikboar
🎬
A cool stream
Today's Broadcast
ZainboarKartikboar
🎬
Spooky Kartik
Today's Broadcast
ZainboarKartikboar
🎬
Water physics 101
Today's Stream
ZainboarKartikboar
🎬
Scrum master Zain
Today's Stream
ZainboarKartikboar
🎬
Zain applying his scrum master skills
Today's Stream
ZainboarKartikboar
🎬
Zain the blunderer
Today's Stream
ZainboarKartikboar
🎬
Healthier than other traditional drinks
Today's Stream
ZainboarKartikboar
🎬
Real headscratcha
Today's Stream
ZainboarKartikboar
🎬
Bracket blues
Today's Stream
ZainboarKartikboar
🎬
If statements are not good practice
Today's Stream
ZainboarKartikboar
🎬
Kappa Quality Code
Today's Stream
ZainboarKartikboar
🎬
Exciting switch statements
Today's Stream
ZainboarKartikboar
🎬
Switched-on hat
Today's Broadcast
ZainboarKartikboar
🎬
Functions, one of the big coding challenges
Today's Broadcast
ZainboarKartikboar
🎬
Break fast
Today's Broadcast
ZainboarKartikboar
🎬
Blood and breath pumping up
Today's Broadcast
ZainboarKartikboar
🎬
Wrong since day 1
Today's Broadcast
ZainboarKartikboar
🎬
Electronic waves
test
ZainboarKartikboar
🎬
RAWR coders
test
ZainboarKartikboar
🎬
Transit in Japawn
test
ZainboarKartikboar
🎬
Xs sponsorship
test
ZainboarKartikboar
🎬
Lame roars
test
ZainboarKartikboar
🎬
Setting up a suppository in Diagon Alley
test
ZainboarKartikboar
🎬
Background Diagon Alley
test
ZainboarKartikboar
🎬
Half speed zain
test
ZainboarKartikboar
🎬
One second penetration
test
ZainboarKartikboar
🎬
Top loading switches
test
ZainboarKartikboar
🎬
Making it rain with CodeBuild
test
ZainboarKartikboar
🎬
What is a sea cable?
Today's Stream
ZainboarKartikboarToreyboar
🎬
If statements are bad practice
Today's Broadcast
ZainboarKartikboar
🎬
Tomato fan
Today's Broadcast
ZainboarKartikboar
🎬
Strong intro
Today's Stream
ZainboarKartikboar
🎬
Impossible URL
Today's Stream
ZainboarKartikboar
🎬
Clever devs
Today's Stream
ZainboarKartikboar
🎬
Always CORS related problems
Today's Stream
ZainboarKartikboar
🎬
CORS headscratcha
Today's Stream
ZainboarKartikboar
🎬
Torres Strait Icelander people
Today's Stream
ZainboarKartikboarThaneshboar
🎬
Icelander or Islander?
Today's Stream
ZainboarKartikboarThaneshboar
🎬
Best Practices
101/200 Episodes
ZainboarThaneshboar
🎬
ROAR coders
105/200
ZainboarThaneshboar
🎬
Diagon Alley? What is that kind of fing?
112/200
ZainboarKartikboar
🎬
C.O.D.I.N.G
113/200
Zainboar
🎬
What's testing
115/200
ZainboarThaneshboar
🎬
CORS coders
115/200
ZainboarThaneshboar
🎬
Complimenting the wrong person
Today's Stream
ZainboarThaneshboar
🎬
Alt+F4 Zain
Today's Stream
ZainboarThaneshboar
🎬
Fixing and failing
Today's Stream
ZainboarThaneshboar
🎬
Brown is always better than white
AWS Websocket + DyanmoDb + Lambda
ZainboarThaneshboar
🎬
Wild street dogs
Today's Stream
ZainboarToreyboar
🎬
The more you know
How to Host Web App Using AWS S3, CloudFront and Route53
ZainboarThaneshboar
🎬
Inactive brain
How To Host Web App In AWS S3 with Custom Domain Using Route 53
ZainboarThaneshboar
🎬
No electricity in Bali
Today's Stream
ZainboarToreyboar
🎬
Francesco
Today's Stream
ZainboarToreyboar
🎬
Indian givers
Compare Hashed Passwords Using Bcryptjs
ZainboarToreyboar
🎬
Cold coffee, cold tea
Today's Stream
ZainboarToreyboar
🎬
Tough questions
Verify Passcode Saving Information to DynamoDB with NodeJs
ZainboarThaneshboar
🎬
Tandoor? Wat even iz dat kind of fing
Today's Stream
ZainboarThaneshboar
🎬
This is why you don't click ops
Today's Stream
ZainboarToreyboar
🎬
Bish Bash Bosh
Get Board Columns from Frontend to Backend NodeJS
ZainboarThaneshboarToreyboar
🎬
Zip first developer
Today's Stream
ZainboarThaneshboar
🎬
Busted again
Today's Stream
Zainboar
🎬
Torey the stinker
Beta Testing Fixes Part 2
ZainboarToreyboar
🎬
Torcoders which are roarers
Beta Testing Fixes Part 3
ZainboarThaneshboar
🎬
Delusional Zain
Beta Testing Fixes Part 3
ZainboarThaneshboar
🎬
Hey guys, torey here
Beta Testing Fixes Part 3
ZainboarThaneshboar
🎬
Zain's going platinum
Today's Stream
ZainboarThaneshboar
🎬
Doggy dog
Today's Stream
ZainboarThaneshboar
🎬
Fartik
How To Test Prevention XSS Attack
ZainboarKartikboar
🎬
Second Favourite
Today's Stream
Zainboar
🎬
Disco Zain
Today's Stream
Zainboar
🎬
Keyboard allergies
Hook Up AWS Websocket
Zainboar
🎬
As you been poopin?
Hook Up Board Columns to Websockets Nodejs + AWS Websockets
Zainboar

Subtitles

0:00:02
[Music]
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:50
which relates to
0:00:52
adding
0:00:53
persistent storage to the current open
0:00:55
source project
0:00:56
scrambler.ca um yesterday we
0:01:00
were fixing a
0:01:01
github
0:01:03
bug or um not exactly a bug but like
0:01:06
override
0:01:07
which we
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:16
close
0:01:17
um we are probably gonna
0:01:19
show you guys how to fix a github
0:01:21
override or
0:01:23
um
0:01:24
overwritten merger quest
0:01:26
so
0:01:27
yes let's just get started what do we
0:01:29
have today zen
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:43
right then
0:01:45
here we go
0:01:48
there
0:01:49
that's there
0:01:50
i'm just gonna open up the
0:01:52
github account
0:01:55
uh yeah this is the one
0:01:59
okay so i think
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:11
for the
0:02:12
script.js and it isn't just copied and
0:02:16
pasted it
0:02:17
in the
0:02:19
that branch but it wasn't working isn't
0:02:21
it
0:02:22
yes it wasn't
0:02:24
yeah
0:02:25
so we need to
0:02:26
take it off from there
0:02:30
yeah we need to compare it and see
0:02:32
um
0:02:34
yes
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:52
mean and death
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:18
take this comment
0:03:25
and
0:03:26
[Music]
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:39
yeah
0:03:42
that's right
0:03:45
um
0:03:45
[Music]
0:03:52
i'm just thinking because we did this
0:03:55
yes today as well but it didn't really
0:03:58
work for us
0:04:00
[Music]
0:04:09
you know what i'm thinking
0:04:11
yeah
0:04:12
is that
0:04:14
we can just roll the master branch um
0:04:18
the main branch
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:31
code but
0:04:32
the
0:04:33
loss is working
0:04:35
yeah
0:04:37
um
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:54
right
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:06
get checkout main
0:05:15
[Music]
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:29
what happens
0:05:31
yeah
0:05:31
[Music]
0:05:34
um we just need this code actually
0:05:39
we don't even need this code now is
0:05:42
isn't it
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:04
delete file copy
0:06:09
ah okay
0:06:11
and now if we try and
0:06:14
check out main
0:06:17
yep
0:06:20
there we go
0:06:23
i think that's done
0:06:25
and now we need to get
0:06:28
reset hard
0:06:30
no no
0:06:33
minus minus and heart is small
0:06:39
yup and the name of the parent
0:06:44
this one
0:06:45
yeah
0:06:46
okay
0:06:48
head is
0:06:50
now a branch main off that why can't
0:06:53
okay
0:06:54
this is
0:06:55
why i can't see it
0:06:57
into main
0:06:59
head is
0:07:04
now we can do get stages
0:07:08
um then you yeah you might wanna turn
0:07:10
off your messages
0:07:12
uh it's coming again
0:07:16
i already
0:07:17
quoted that
0:07:22
all right nothing to commit get pulled
0:07:26
do i get paul
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:37
want
0:07:38
it's up
0:07:40
there into that commit
0:07:43
yeah and that's what we want right on
0:07:45
local
0:07:46
[Music]
0:07:47
okay yeah i see what you mean now
0:07:52
yeah
0:07:53
get
0:07:56
it's
0:07:57
status
0:08:01
quick right can you do a good branch
0:08:03
minus a
0:08:06
and also can you zoom in a bit please
0:08:10
ah i'm slacking again
0:08:13
come on zayn
0:08:16
be first off
0:08:17
all right
0:08:20
yeah that's fine
0:08:21
all right
0:08:22
now try running
0:08:26
running wall
0:08:28
um the application
0:08:31
and see if adding notes work
0:08:43
i
0:08:44
think
0:08:49
um
0:08:55
cool
0:09:10
all right let's see
0:09:15
uh this is not gonna work
0:09:17
why not
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:28
it does
0:09:31
what oh
0:09:34
oh okay i thought that was in all right
0:09:37
yeah
0:09:38
that makes sense
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:05
go up
0:10:08
just a bit up
0:10:09
just a bit up here line 32
0:10:15
are you
0:10:16
sure that's the one
0:10:19
yeah no that's not the one
0:10:22
oh really oh
0:10:22
[Music]
0:10:24
oh okay
0:10:26
there you go that was the one
0:10:28
oh yeah cool all right
0:10:31
i'm gonna do that
0:10:44
and
0:10:47
references no stream no i don't need
0:10:50
that
0:10:51
don't need that either
0:10:56
[Music]
0:11:03
here we go and we hard refresh by
0:11:06
command shift r
0:11:09
and then do i said seven this time
0:11:14
go back
0:11:16
and then hope for the best plan for the
0:11:18
worst
0:11:19
no it's not it doesn't work still no no
0:11:22
um
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:40
that he always do
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:54
huh
0:11:57
i will
0:11:58
i will uh but first i need to do that
0:12:02
command
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:13
honestly
0:12:15
my heart is being really fast at the
0:12:17
moment
0:12:18
first one yeah
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:30
size settings
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:43
boy
0:12:46
all right zen is gone
0:12:50
oh my
0:12:53
let me just check on him what happened
0:13:00
okay
0:13:01
where did you
0:13:04
go zen
0:13:08
just waiting for him to reply
0:13:16
anyways
0:13:17
we'll get back
0:13:19
and
0:13:21
fix this thing for sure at this time
0:13:24
and
0:13:25
[Music]
0:13:26
yeah just um
0:13:28
let's say and come by until
0:13:31
i'll take you guys through the
0:13:34
repository
0:13:36
myself one second he applied
0:13:42
okay
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:52
the stream
0:13:58
that's fine we'll go to github and see
0:14:01
what's happening
0:14:02
there
0:14:06
so
0:14:08
the last change was made
0:14:11
on death
0:14:15
oh boy
0:14:20
right
0:14:22
two days ago to these two branches
0:14:25
um
0:14:25
[Music]
0:14:27
okay let's see what
0:14:29
kind of desktop says
0:14:32
these branches
0:14:45
all right waiting for it to open
0:14:49
[Music]
0:14:57
[Music]
0:14:58
um
0:15:08
already
0:15:11
do i wanna pull master
0:15:14
i don't think so
0:15:24
okay see the history of this branch
0:15:33
oh boy
0:15:46
because the branch
0:15:50
i think i need to fetch
0:16:00
all right
0:16:08
this was on july
0:16:11
29th
0:16:13
only one file was changed
0:16:24
is
0:16:25
still here i don't think so
0:16:28
nope
0:16:30
i think sam doesn't like us that much
0:16:39
all right um
0:16:41
if zen is not coming right now i'll go
0:16:44
ahead
0:16:45
and
0:16:46
continue the good work
0:16:50
all right
0:16:55
scrambler enhancement
0:16:58
here we
0:16:59
were status
0:17:04
right
0:17:05
i don't want to
0:17:06
pull them
0:17:09
so what i'm going to do is
0:17:12
i'm going to do
0:17:13
my documents
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:52
uh
0:17:54
change the current
0:17:56
uh version of my middleware
0:17:59
all right
0:18:00
so as you guys know the problem which we
0:18:02
were facing was relating to
0:18:05
a merge
0:18:06
override to the main
0:18:09
so let's see uh
0:18:12
which branch
0:18:24
[Music]
0:18:26
on origin and i'll do how many branches
0:18:29
we have
0:18:31
oh boy
0:18:32
all right
0:18:35
there's our cute little dev branch as
0:18:37
well
0:18:39
okay wq to exit run
0:18:44
o
0:18:45
k now
0:18:46
so you want to do a get diff between
0:18:49
main and
0:18:51
dev
0:18:55
i really forgot how to do a good diff
0:18:56
but that's fine
0:18:58
um firstly i'm gonna try running the
0:19:00
application
0:19:02
same simple
0:19:03
http server
0:19:06
to run it
0:19:08
and of course it started to run on my
0:19:10
local server
0:19:12
it's gonna go to safari because i don't
0:19:13
wanna clear cache
0:19:16
looks like i don't have any other
0:19:17
options so i'm gonna go to chrome
0:19:23
alrighty
0:19:26
um yes so let's do
0:19:29
okay five
0:19:32
oh boy oh
0:19:34
i know why that's happening
0:19:36
so we forgot to uncomment
0:19:39
these
0:19:41
from our middleware
0:19:44
all right
0:19:48
um
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:19:58
and this time
0:19:59
[Music]
0:20:01
boy
0:20:03
okay
0:20:04
let's do a hard refresh
0:20:08
please
0:20:09
work directly
0:20:11
on the html k4
0:20:15
oh nice
0:20:22
okay there must be a reason why that's
0:20:24
not working
0:20:25
um
0:20:27
right
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:36
and now
0:20:39
i'm gonna switch to my dev branch where
0:20:42
it has the
0:20:44
um
0:20:45
correct version of the current
0:20:48
middleware
0:20:50
right
0:21:00
so that's our
0:21:01
nice step branch
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:25
all right
0:21:36
hey looks like zan is restarting his
0:21:38
computer
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:52
to my
0:21:54
current version of scrambler enhancement
0:21:57
and looks like it was a good decision to
0:22:00
not
0:22:02
get bullish
0:22:04
as
0:22:05
this version wouldn't probably work as
0:22:07
well
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:21
[Music]
0:22:24
server is running
0:22:32
all right
0:22:36
here we go
0:22:37
[Music]
0:22:40
start finding the main index file
0:22:44
that is interesting
0:22:52
hmm okay
0:22:59
[Music]
0:23:01
all right um looks like we are
0:23:04
having this error which is not able to
0:23:06
find them in file
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:16
again
0:23:18
no they can't hear me
0:23:20
oh hey zen how's it going
0:23:23
ah
0:23:24
yeah
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:30
because
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:40
went away
0:23:43
yeah that's my lesson all right did you
0:23:46
hear me like saying no no no
0:23:58
all right um
0:24:00
to the stream cool so where were we
0:24:02
again
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:10
clear this one
0:24:13
did you wait
0:24:14
are you on the clear cash screen yeah
0:24:17
i've gone through there
0:24:19
oh
0:24:20
oh come on a minute
0:24:24
that's weird
0:24:26
this is really weird
0:24:29
oh because i
0:24:31
i shared my screen
0:24:32
yes i have oh you haven't that's me oh
0:24:35
[ __ ]
0:24:36
oh
0:24:38
ah okay
0:24:40
right
0:24:41
because
0:24:42
i had this
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:50
screen
0:24:54
cool there we go
0:24:58
brilliant now we're back
0:25:02
cool ah since
0:25:04
this is what he was
0:25:06
doing so i'll just
0:25:07
remove that
0:25:09
and go to this one open this one up
0:25:14
in
0:25:18
vs code again
0:25:23
come on come on
0:25:27
[Music]
0:25:30
let's go boy
0:25:32
yep
0:25:34
we done that
0:25:37
right um
0:25:40
so in that command just want to check
0:25:43
you uh that may had
0:25:48
middle um
0:25:50
the middleware
0:25:52
because
0:25:54
i was suspecting as well that the
0:25:56
comment did not have with their file
0:26:00
yeah
0:26:01
so if i go
0:26:04
back to scrum block
0:26:07
enhancement
0:26:09
[Music]
0:26:15
[Music]
0:26:21
ah fine
0:26:26
you have to go to the comet on that
0:26:28
stage
0:26:42
client
0:26:46
that's really
0:26:48
interesting it doesn't even have that
0:26:52
yep um i guess
0:26:54
you need to put in when you did a git
0:26:56
reset
0:26:58
um
0:26:59
you need to
0:27:01
um
0:27:02
one second
0:27:06
oh
0:27:06
wait
0:27:18
okay look at this one look at this stack
0:27:20
of launcher and
0:27:22
um
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:43
all right good
0:27:45
tag branch
0:27:46
community
0:27:48
that's exactly what we did
0:27:51
oh so it's saying that
0:27:54
do
0:27:56
the
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:07
in that case
0:28:10
so get
0:28:13
[Music]
0:28:14
reset pod
0:28:18
[Music]
0:28:19
and then
0:28:21
what was the tag
0:28:24
for
0:28:25
tag
0:28:26
branch
0:28:27
comment
0:28:29
[Music]
0:28:42
if you wish to commit that's this so
0:28:44
they return country also points to the
0:28:48
road
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:08
this
0:29:09
replace this one with that comment that
0:29:12
they want to go back to
0:29:14
um
0:29:16
get reset how long is it the letters
0:29:20
um
0:29:21
here no no
0:29:22
[Music]
0:29:25
where he has written get reset minus one
0:29:27
is hard
0:29:29
this three six nine ten
0:29:33
and how long was ours
0:29:35
uh
0:29:36
no
0:29:37
no
0:29:38
not
0:29:41
[Music]
0:29:50
[Music]
0:29:52
hang
0:29:52
on three
0:29:55
two four
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:10
i'm gonna
0:30:11
try this and see what this one comes up
0:30:14
with
0:30:15
yeah
0:30:19
yeah try that try that
0:30:32
just do this
0:30:34
why am i thinking a
0:30:37
five four
0:30:38
nine
0:30:40
e f a
0:30:42
it's free free
0:30:44
okay five four nine before a three three
0:30:47
okay
0:30:48
that is
0:30:49
now i remember references that one
0:30:52
yep okay
0:30:54
no
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:08
come on i didn't
0:31:10
get pulled
0:31:11
over
0:31:12
brought me to them
0:31:15
let's
0:31:17
comment again
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:35
this one
0:31:36
and see if the
0:31:37
notes are actually working
0:31:40
yep so just run the button command and
0:31:42
let's see
0:31:44
you already clear your cash so i should
0:31:46
be fine
0:31:53
i thought you would just suffer with the
0:31:54
netflix password but you did
0:31:58
it
0:32:03
i haven't got any um
0:32:05
those
0:32:06
[Music]
0:32:08
movies
0:32:10
subscriptions out
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:29
there are two
0:32:30
comments as well
0:32:32
uh if you
0:32:33
can
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:46
um yes we
0:32:48
were trying them but
0:32:50
then it's
0:32:52
um
0:32:53
[Music]
0:32:54
the gui
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:05
um the gui stuff
0:33:07
um
0:33:09
yeah i but i use it i i like it and it's
0:33:12
easier so
0:33:15
um
0:33:17
fork for mac oh yeah yeah we can focus
0:33:19
on yeah
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:39
see
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:00
12 am
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:22
um
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:31
then what you
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:38
should differ
0:34:39
yeah yeah
0:34:41
okay and then
0:34:42
merge main into depth don't merge the
0:34:45
other way around
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:34:55
words
0:34:58
yeah
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:21
last
0:35:22
that branch
0:35:25
cool so it's behind two
0:35:28
comments yeah that's fine
0:35:35
okay
0:35:37
um
0:35:40
so all these means that they have been
0:35:42
added
0:35:43
isn't it
0:35:44
oh yeah
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:04
file
0:36:05
huh
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:23
compare
0:36:25
that
0:36:26
because
0:36:28
i'm actually just
0:36:30
learning this tool as well so
0:36:33
i just
0:36:34
do that as well um so
0:36:37
did you say
0:36:38
death to me whatever you did last time
0:36:41
just do the vice versa of that oh
0:36:44
hang on
0:36:46
i think we need to push the main first
0:36:50
because that still shows three weeks ago
0:36:54
oh
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:09
and then
0:37:10
uh we'll compare it to that branch
0:37:14
don't push anything to me
0:37:18
you'll see
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:27
branch
0:37:29
yeah and you have to do minus b
0:37:36
okay
0:37:38
yep
0:37:39
all right that's done and
0:37:43
now
0:37:45
so
0:37:45
what exactly are we trying to do here
0:37:49
um
0:37:50
we don't want to push anything to main
0:37:54
so
0:37:54
we're gonna put main back to its state
0:37:57
when you made the merge
0:37:59
um
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:12
to devon
0:38:14
at the moment
0:38:15
and then
0:38:21
after pushing it actually try it right
0:38:23
now i think it will work
0:38:27
after pushing it
0:38:29
nana don't push it don't push it do
0:38:31
compare reference
0:38:34
okay
0:38:35
i need to
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:09
until
0:39:10
it's production
0:39:11
yeah
0:39:12
yeah exactly okay cool
0:39:16
now i think i'm with you so what i'm
0:39:18
gonna do is
0:39:20
do a hard on that one
0:39:25
pillow
0:39:33
i need to compare the dummy to them now
0:39:36
isn't it yes
0:39:40
oh that's three weeks ago as well okay
0:39:42
um
0:39:44
that's
0:39:46
exactly what we want right the three
0:39:47
weeks ago
0:39:49
one the 29th july one
0:39:56
yes yeah yeah
0:39:59
so
0:40:00
[Music]
0:40:01
compare it with
0:40:03
dummy and there
0:40:04
so too
0:40:08
behind all right
0:40:12
um
0:40:13
right
0:40:14
i think you should try comparing dev to
0:40:16
dummy right now you're comparing dummy
0:40:18
with dev
0:40:22
let's see how it works the other way
0:40:23
around
0:40:29
[Music]
0:40:32
dev with
0:40:34
dummy
0:40:35
heck why am i doing good
0:40:45
yes
0:40:48
i had
0:40:50
these i had fixing branch
0:40:53
no i don't need this one
0:40:55
actually
0:40:58
ah here we go
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:06
and then
0:41:08
yeah
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:20
only comes in um
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:38
when
0:41:40
yesterday
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:41:58
the
0:41:59
both of the
0:42:01
script files
0:42:05
[Music]
0:42:13
um then then one second can you open the
0:42:16
script file in the current one okay
0:42:20
that's fine yeah
0:42:23
[Music]
0:42:27
right
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:34
afterwards
0:42:37
i have no idea what's
0:42:41
weird doing but yeah i'll just follow
0:42:44
you now
0:42:46
right um
0:42:48
yeah just do ctrl n
0:42:51
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:07
yeah
0:43:08
now open the script file again
0:43:13
yeah now let's compare if there's any
0:43:16
change
0:43:18
to
0:43:18
[Music]
0:43:20
so this is the code which you're seeing
0:43:22
for script
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:40
yeah
0:43:42
yeah um so one
0:43:44
my
0:43:45
take
0:43:47
would be because it's becoming a bit
0:43:50
a bit too complicated
0:43:53
and
0:43:54
one
0:43:56
my simple approach would
0:43:59
be there why not because we're learning
0:44:03
at the moment
0:44:04
um we can
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:17
um
0:44:20
on the exam comment that we want it to
0:44:23
be okay
0:44:25
i mean it is right it is three weeks ago
0:44:27
comment
0:44:29
yes but it's not pushed into the remote
0:44:32
branch the remote master branch it's
0:44:35
only that that'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:44
check it locally
0:44:46
because if you if you push it to main
0:44:50
then we can simply
0:44:52
do
0:44:54
a merge
0:44:55
between
0:44:57
dev
0:44:58
and
0:44:59
um
0:45:01
devin main
0:45:03
we can do it right now as well locally
0:45:04
as well
0:45:09
without actually pushing any code
0:45:13
but the
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:29
yeah but
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:36
same file
0:45:37
um
0:45:38
[Music]
0:45:39
if you go and look um
0:45:41
the socket stuff is
0:45:45
[Music]
0:45:58
actually i'm gonna download that
0:46:00
software really
0:46:02
quick because that's really helpful
0:46:05
all right yeah
0:46:09
so does this software like compare to
0:46:11
files
0:46:14
uh
0:46:15
text folders files everything
0:46:19
oh i'm pretty sure we can get something
0:46:20
online as well
0:46:22
compared to
0:46:24
text files
0:46:28
there's a tool called text compare
0:46:50
checks compare was it
0:46:53
um
0:46:54
yes actually tried diff checker
0:47:01
let me just do this
0:47:04
want
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:14
so
0:47:15
it shouldn't really
0:47:17
um
0:47:19
make any difference to that
0:47:21
um it's called diff checker
0:47:24
mod div
0:47:26
diff
0:47:29
[Music]
0:47:36
there you go
0:47:38
yes this
0:47:41
fine difference
0:47:43
useful okay
0:47:47
so
0:47:48
this is the
0:47:49
one from the
0:47:50
dummy right
0:47:53
yes
0:47:55
yep that's the original one ah i painted
0:47:58
it two times
0:48:00
okay and the one from
0:48:03
the
0:48:04
yeah dev
0:48:06
that branch is there
0:48:11
dummy and then
0:48:13
yep
0:48:16
fine
0:48:17
differences
0:48:20
too
0:48:21
far identical
0:48:23
yeah so
0:48:26
pretty sure you pasted yesterday and
0:48:28
saved them
0:48:31
that's why
0:48:32
if you compare
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:48
from
0:48:49
um the
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:48:59
um yeah
0:49:00
this same
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:09
merge
0:49:10
dummy into dev
0:49:12
and then test the
0:49:15
all application let's do that so okay
0:49:19
merge
0:49:22
dummy
0:49:24
already up to date
0:49:31
you shouldn't say that
0:49:35
oh not possible
0:49:39
your brand is already up to date
0:49:42
and this
0:49:49
check out
0:49:52
dummy
0:49:56
how can that
0:49:58
that be up to date
0:50:01
or i could merge them and dive into
0:50:05
dummy then
0:50:06
yeah yeah
0:50:15
okay
0:50:16
that's that
0:50:19
okay so
0:50:20
the order of the branches also makes a
0:50:23
huge
0:50:24
difference apparently um
0:50:27
right
0:50:28
now let's test it
0:50:30
so i'm
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:39
the pro branch
0:50:41
[Music]
0:50:47
yeah yeah
0:50:49
do that first
0:50:53
what am i doing
0:50:55
um it was right there yeah
0:50:58
http
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:12
which is
0:51:13
pretty good
0:51:15
thing of
0:51:17
things isn't it
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:45
these ones
0:51:49
oh
0:51:56
right line 50 something it's already
0:51:58
uncommented
0:52:00
oh it's not
0:52:05
all right
0:52:06
that one's done
0:52:08
now do that again
0:52:15
hopefully we can finish this
0:52:17
major issue
0:52:21
before this works right now and we're
0:52:24
finished
0:52:29
okay
0:52:36
cash
0:52:57
okay oh
0:52:59
html
0:53:18
okay
0:53:21
no
0:53:24
um
0:53:24
[Music]
0:53:26
actually
0:53:28
oh
0:53:30
i think
0:53:33
right
0:53:35
um
0:53:40
would you mind comparing um dummy and
0:53:42
death
0:53:49
um
0:54:08
dummy and then dev right
0:54:11
yeah
0:54:12
these both have two
0:54:13
of the same ones
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:31
so wait
0:54:33
yeah compare compare dev and main ones
0:54:49
three weeks
0:54:50
ago and go on 17 files
0:54:55
see what changes are made in the index
0:54:56
file
0:55:09
all right so
0:55:11
this is
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:25
stuff as well
0:55:27
ah here we go that's the problem is it's
0:55:30
not picking up script
0:55:32
js apparently
0:55:34
yes
0:55:36
that might be it
0:55:38
one second
0:55:40
the right one is the dev branch and the
0:55:43
left one is
0:55:46
main
0:55:47
right
0:55:50
to be honest
0:55:52
i don't know how to tell now um because
0:55:56
the deaf and
0:55:57
deaf with me
0:56:01
the
0:56:02
the head of um dev was o dot
0:56:06
bff family member
0:56:09
uh-huh
0:56:10
okay yeah in
0:56:12
that's the show right this is main and
0:56:15
then this is
0:56:16
dev
0:56:18
right
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:33
because
0:56:35
the script file isn't imported
0:56:37
and
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:56:58
they
0:56:59
that one
0:57:00
39
0:57:04
yep that's probably something
0:57:07
yeah that should
0:57:09
do the trick
0:57:11
kindly we were missing this
0:57:16
it's all this
0:57:17
small
0:57:18
really smooth things that
0:57:22
create
0:57:23
huge impacts at the end
0:57:26
[Music]
0:57:31
i mean you uni really taught us um get
0:57:34
properly so
0:57:35
like
0:57:37
i can
0:57:38
focus on it um yeah and like when i
0:57:42
worked as well it it was a
0:57:44
like
0:57:45
it's good to know
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:57:53
get just
0:57:55
from you
0:57:57
right yeah
0:57:59
all right okay
0:58:01
so
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:07
dev
0:58:08
yeah and then
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:16
so much
0:58:19
dummy
0:58:20
you have to go there first
0:58:24
all right
0:58:24
[Music]
0:58:26
anyone um
0:58:28
you have
0:58:29
these comments here
0:58:33
fill in
0:58:35
yeah it did
0:58:37
okay
0:58:39
that's interesting
0:58:42
so it transferred the
0:58:44
um modifications to david
0:58:47
to dev as well
0:58:49
oh really
0:58:52
apparently
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:04
but
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:15
merge it
0:59:17
is it
0:59:18
no you should just merge it for now
0:59:20
are you sure
0:59:22
um
0:59:24
wasn't that the case
0:59:28
well
0:59:29
you're better than me in the
0:59:33
things so
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:41
try this
0:59:43
if it is already up to date then it's
0:59:44
fine
0:59:47
why are we
0:59:48
okay we are imagine
0:59:50
we changed it
0:59:52
which is
0:59:54
already out today
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:05
um
1:00:06
yeah line number 39
1:00:09
okay yeah that's fine
1:00:10
yeah
1:00:12
okay so now i'm going to just add it and
1:00:15
then
1:00:17
yeah let's push it to
1:00:20
commit
1:00:22
um
1:00:23
yes
1:00:25
and before
1:00:26
pushing like don't forget to delete
1:00:28
dummy
1:00:29
yeah yeah of course i'm gonna do that
1:00:33
okay that one's there
1:00:35
and then
1:00:36
go all the way
1:00:39
that one's okay add
1:00:44
at all
1:00:45
right and get
1:00:49
comments
1:00:56
[Music]
1:01:06
decide fixing um
1:01:08
dev
1:01:10
um
1:01:10
[Music]
1:01:12
in line with
1:01:14
me all right
1:01:16
yeah sure
1:01:19
here we go and
1:01:20
push it
1:01:29
[Music]
1:01:37
remove
1:01:42
um
1:01:42
you know how to delete a branch
1:01:44
no i don't
1:01:46
yeah just to um
1:01:48
also call grid branch minus d
1:01:51
okay branch
1:01:54
minus d minus
1:01:56
d and then the branch
1:01:58
name is n
1:01:59
yep
1:02:01
really okay cool ah oh wait i learned
1:02:05
something new
1:02:08
okay and now i'll just merge um
1:02:11
let's push it
1:02:13
to moss
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:22
your
1:02:23
um
1:02:24
push
1:02:28
um
1:02:28
[Music]
1:02:29
change the head or you know how the main
1:02:31
file we reset it to 29 july
1:02:36
yes
1:02:37
reset
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:56
so we don't want
1:02:57
it to override to the previous um
1:03:01
uh 29 july 1.
1:03:03
we just want to keep it updated
1:03:06
then we'll search
1:03:08
so
1:03:10
what i should do is
1:03:12
i should just
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:20
current version
1:03:23
in the main
1:03:25
yes yeah
1:03:28
because
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:33
to the
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:45
yeah
1:03:45
the
1:03:47
the merge you you did that's the latest
1:03:49
version
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:00
so i would
1:04:02
keep pull on the main branch and isn't
1:04:04
it
1:04:05
um
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:35
want
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:41
so yes
1:04:43
we just did that to get the code
1:04:46
now
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:04:56
yes so which is
1:04:58
why i meant there
1:05:01
now we would do a gift pool on the main
1:05:04
branch so it comes on the
1:05:06
latest
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:17
in most sense
1:05:19
because we made changes to our dev
1:05:20
branch right
1:05:23
will it pull the dev branch back
1:05:25
so i think you should do a kit fetch
1:05:27
origin not uh
1:05:29
all right um
1:05:31
we would do what you
1:05:34
say because to be
1:05:37
honest
1:05:38
i'm not as confident in
1:05:40
[Music]
1:05:41
yeah at all even
1:05:43
i'm not sure about this
1:05:45
but
1:05:46
um
1:05:48
the safest way is to do it just do get
1:05:51
reset hard and the latest versions tag
1:05:59
okay i think um
1:06:02
my definition of
1:06:04
list and your one
1:06:07
might be a bit different but i just want
1:06:09
to clarify yeah quite that
1:06:13
first because
1:06:15
yes that's important
1:06:17
so when you say get
1:06:19
um
1:06:21
the first test on the top do you mean
1:06:25
this
1:06:26
one is yeah now open your code on this
1:06:29
time
1:06:31
yep yeah
1:06:32
and
1:06:35
right one second yeah
1:06:38
and you see the six four three e tag on
1:06:42
the branch yeah
1:06:43
yeah
1:06:44
on the left
1:06:47
yeah just to get reset minus minus r to
1:06:50
this
1:06:54
right okay okay so essentially what we
1:06:59
are trying to do
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:18
okay cool
1:07:20
so we would do that
1:07:22
yep
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:32
[Music]
1:07:33
that
1:07:34
nothing we can try it we can take a risk
1:07:36
i mean i don't mind
1:07:38
trust me
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:50
yeah
1:07:53
okay head is now there already
1:07:58
now we do a merge
1:08:00
dev right
1:08:02
no
1:08:04
right yeah yeah
1:08:05
yes
1:08:07
wait we didn't test the dev though we
1:08:10
just tested dummy
1:08:12
but now it's lit
1:08:16
all right um
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:33
failed
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:41
first uh it was
1:08:44
it's
1:08:47
reverses now
1:08:49
um it was yeah
1:08:52
i'm not sure
1:08:54
um
1:08:56
it was getting rewarded
1:08:58
oh you can do a um what do you call it
1:09:01
get merged reset
1:09:04
okay which one do you want to use
1:09:06
get merged reset
1:09:08
i see that
1:09:10
yes
1:09:12
do any one of these
1:09:16
okay
1:09:17
yeah
1:09:21
okay we can't go back apparently
1:09:24
um
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:40
[Music]
1:09:44
okay so you wanna test uh the dev branch
1:09:49
first
1:09:50
yes please
1:09:52
[Music]
1:10:01
[Music]
1:10:04
but that's good that we were able to fix
1:10:06
the error though
1:10:07
yeah
1:10:09
even though
1:10:10
it costed us over time
1:10:13
yeah i think that's worth it exactly
1:10:19
all right
1:10:21
let's open up this bad boy now
1:10:40
in our wrong folder again
1:10:52
okay
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:27
cool
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:51
what was it
1:11:53
on z11
1:11:57
there's gonna be a lot of boards
1:12:03
i can see that and
1:12:16
apparently no
1:12:20
um do it once more and
1:12:24
put something discreet i might have
1:12:26
forgot it
1:12:27
no like insert another board
1:12:30
keep this
1:12:33
it's running right
1:12:36
post it
1:12:38
all right
1:12:43
all righty let's give it a go
1:12:46
all right
1:12:49
let's do
1:12:51
presents
1:12:53
okay
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:24
this part
1:13:27
yeah oh no
1:13:29
actually no um dev is actually not
1:13:31
working so
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:43
to this as well
1:13:44
yeah let's put that
1:13:50
actually just bear with me
1:13:52
no no i am
1:13:55
what am i doing no no i'm trying to
1:13:58
debunk it no no
1:14:00
focus in focus
1:14:02
it's toxic
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:13
error again then
1:14:17
i'm gonna kill myself
1:14:28
should we ever look
1:14:29
no
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:38
middleware
1:14:40
this is really big too honestly
1:14:49
line 17 and line 20.
1:14:56
[Music]
1:15:07
[Music]
1:15:08
if it's the course here this is the last
1:15:10
day
1:15:18
please don't go okay
1:15:21
i won't let it be
1:15:23
oh let it be
1:15:32
one two three four
1:15:39
but no error
1:15:41
nothing
1:15:42
comes up
1:15:43
boy oh boy
1:15:45
um
1:15:47
yeah now we can come back tomorrow all
1:15:49
right yeah i don't want to do this
1:15:50
anymore
1:15:52
all right
1:15:54
all right
1:15:56
it's
1:15:57
no changes
1:16:03
okay i'm gonna push this keep commit i
1:16:06
see if they have
1:16:08
they haven't been any changes
1:16:10
so i'll just push it okay
1:16:15
finally
1:16:19
it can happen
1:16:21
yeah
1:16:22
all right all right
1:16:23
cool um
1:16:25
yeah so
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:36
we
1:16:37
actually have done about 30 minutes over
1:16:41
time
1:16:42
no 17 minutes of
1:16:46
time but it has been pretty pretty
1:16:50
productive
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:57
the board name
1:16:59
isn't posting so we'll be working on
1:17:02
that one
1:17:05
some more fun um
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:21
screen then
1:17:23
yeah so that's a really good question
1:17:25
andre because
1:17:26
i actually tracked it today and um
1:17:30
it's estimated or approval is 26th of
1:17:34
august
1:17:35
oh boy
1:17:36
oh
1:17:37
a
1:17:38
week yeah
1:17:40
but um
1:17:42
yeah
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:00
resolved the
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:09
and
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
Other clips featured in this episode