0:00:24
what is going on guys welcome back to
0:00:27
another session of bill break and fix
0:00:29
brought to you by exclusively
0:00:32
raw coders and today you have
0:00:38
is that i'm gonna take a screenshot of
0:00:46
interesting to show him afterwards
0:00:52
wow wow i like this
0:01:05
his picture just making me laugh
0:01:08
i'm really sorry about my laughter
0:01:21
probably only momentarily
0:01:23
i might have to i think i gotta reset
0:01:26
like my wi-fi adapter or something
0:01:30
if i get booted again i'm gonna have to
0:01:35
yeah that's great that's right no
0:01:42
because your pose when you froze
0:01:52
screenshot it was too
0:01:55
too good to miss well i i'll share it
0:01:58
with y'all to it good good
0:02:01
yeah i'm glad i can and i'm glad i can
0:02:07
you made my day tory you made my day
0:02:10
i feel honored i'm honored
0:02:13
um all right let's do the
0:02:15
acknowledgement and pay our respects to
0:02:17
the elders of the past present and
0:02:22
i begin today by acknowledging the
0:02:24
traditional custodians of the land on
0:02:26
which we gather today and pay my
0:02:28
respects to the elders past present and
0:02:31
future i extend their respect to
0:02:33
aboriginal and torres strait islander
0:02:39
all right that was done pretty smoothly
0:02:46
i'm pretty good i guess
0:02:49
a little bit dark right now though
0:02:57
tiger doing by the way
0:03:01
he's he's doing well he he went in today
0:03:04
for his second round of chemo
0:03:07
but he's he's doing good all right
0:03:14
with fantastic fortitude
0:03:20
there's a reason why we call him
0:03:28
we know he won't give up at all
0:03:33
i don't think so yeah
0:03:35
thanks man appreciate it i do appreciate
0:03:39
that's alright man it's always about
0:03:42
animal care and human care
0:03:45
all right um so today what we plan to do
0:03:51
what's that face that doesn't look
0:03:58
open vs code and it's just
0:04:08
today we plan to merge
0:04:13
different branches into dev and master
0:04:15
both backhand and front end
0:04:22
i was expecting that side
0:04:24
oh wait for it wait for it wait for it
0:04:27
and there he comes should have warned me
0:04:36
i mean yeah after this we we're gonna be
0:04:43
all the latest code up to
0:04:46
s3 cloud front and everything and then
0:04:49
begin our internal testing
0:04:53
so yes um do you want to share your
0:04:57
oh sure shall i do it
0:05:02
should you go for it
0:05:11
do you want live share or do you not
0:05:16
um to be honest um no because um in my
0:05:20
speed i slowed down
0:05:23
your internet speed
0:05:26
oh we are already having problems just
0:05:31
it's actually not the internet speed
0:05:33
it's just it's just my laptop
0:05:40
she needs more juice
0:05:48
we're going to see as well
0:05:50
hey geez is back because the devil
0:05:54
speak of the devil
0:06:02
how i just said uh
0:06:04
i shouldn't have said it
0:06:10
and now he's gonna come back at me
0:06:18
all right um so where do we start first
0:06:21
shall we go in the console
0:06:24
and see how many branches are there in
0:06:27
and then work through them step by step
0:06:31
all right if you want to use the console
0:06:33
what's the what's the uh command
0:06:37
seeing all the branches
0:06:42
in the remote you might be different but
0:06:47
okay branch just shows you all of them
0:06:56
can we make sure that our local is in
0:07:02
sure i'm on i'm on scrambler
0:07:06
uh or sorry sam i'm on the back end
0:07:09
okay cool perfect uh
0:07:12
how do i make sure i was
0:07:22
need kind of two or three sessions
0:07:25
to be done oh by the way uh on the last
0:07:28
show i was talking about i wanted a
0:07:31
hotkey to resize my terminal
0:07:37
they have native like key bindings all
0:07:41
ready to go for you but i had to set up
0:07:45
that was fun because now i can do this
0:07:48
i'm not using my mouse
0:07:50
interesting i like it
0:07:52
yeah i hate this i hate this i hate
0:07:59
clicking right here
0:08:01
i don't know if it's my hand-eye
0:08:02
coordination but i'm just like i have a
0:08:05
hard time clicking right there
0:08:08
instead that's way faster
0:08:13
becoming a keyboard warrior
0:08:16
for certain things like that i i like it
0:08:20
i like that he's fantastic man
0:08:23
sorry all right that was an aside um but
0:08:25
i'm happy to share my uh my how i did it
0:08:29
if anyone is using windows but in mac
0:08:32
like i said they already
0:08:34
uh it's already there
0:08:42
okay so that's that one okay so i would
0:08:47
so basically about common sense i would
0:08:49
say how you check if your remote is in
0:08:53
line with the local is basically
0:09:02
the remote brand uh the repository
0:09:06
the remote one that's already
0:09:11
actually no i'm not
0:09:13
i'm not gonna pull on the background
0:09:15
background music because it will just
0:09:36
did you say on that upper upper right it
0:09:40
shows you all the branches that are in
0:09:43
your in the remote
0:09:53
if these match the ones that are over
0:09:59
what's origin versus upstream
0:10:02
origin versus upstream
0:10:05
i think that would be basically your
0:10:11
that we have created
0:10:16
i'm assuming i think some of these must
0:10:19
are some of these deleted
0:10:26
yeah so we're not gonna touch that one
0:10:30
okay because i don't have that locally
0:10:33
yeah you shouldn't have that one anyway
0:10:38
i guess let's start from oh where did we
0:10:58
so where was the last um can you go into
0:11:03
actually i'm gonna
0:11:08
so it speeds up the process a bit
0:11:20
that's that one raw coders
0:11:22
i need the backhand one
0:11:26
okay so that's the backend one
0:11:30
the last that we did
0:11:41
connection id from dynamodb table
0:11:50
remove connection id from dynamodb table
0:11:57
i guess what we would do is
0:12:06
and start working with that one
0:12:08
and how we will be able to tell
0:12:16
ah okay so we need to start from
0:12:19
websocket integration
0:12:22
websocket integration
0:12:25
all right so should i check that should
0:12:26
i check out that branch
0:12:35
no you would go to
0:12:37
the dev branch and then merge
0:12:40
websocket integration into so check out
0:12:47
check out i forgot do i just
0:12:53
oh yeah right yeah
0:13:07
a branch ah okay uh it's trying to occur
0:13:14
without the be my bad
0:13:18
so now we need to do a git merge
0:13:21
websocket integration
0:13:24
uh it says i'm behind so i'm gonna do
0:13:27
the get get pull right
0:13:30
all right yeah okay
0:13:32
yeah that should be fine
0:13:40
my neighbor's dog is barking that's
0:13:42
driving me nuts i hope you can't hear it
0:13:48
yeah oh my goodness
0:13:50
that's my neighbor
0:13:53
i thought it was your once that's why i
0:14:05
there's nothing i can do man
0:14:14
tell your dog to shut up
0:14:25
right so he's done that one
0:14:30
now what we need to do is basically
0:14:34
we will probably have to test
0:14:38
i think that worked i had to do this
0:14:41
i think that worked the dog stopped
0:14:47
yeah true sorry about that guys
0:14:56
can can you check what code
0:15:03
oh sorry what do you mean
0:15:05
what code has it um merged in as in all
0:15:09
these files have been changed
0:15:13
but i want to check in the code what
0:15:18
what we need to do now is basically
0:15:27
so basically what we need to do is we
0:15:32
the websocket integration functionality
0:15:39
no gective i don't think you missed too
0:15:40
much we're just doing some merge stuff
0:15:45
and get stuff good old gea episode
0:15:52
okay you want me to test this
0:15:55
yes please and just check if the web
0:15:58
socket is still working
0:16:00
how do you want me to test it
0:16:17
i wanted to test it but i'm
0:16:21
thinking about other things as well now
0:16:34
i need your opinion here
0:16:42
we merge each branch to death
0:16:50
test the dev branch after each merge of
0:16:57
the second approach is merge
0:17:00
everything into def
0:17:02
and then once and for all test the
0:17:05
overall functionality and
0:17:08
check that if what we have implemented
0:17:11
so far is happening in that branch
0:17:16
i think the second one because i'm not
0:17:19
sure that all the branches are
0:17:26
i don't know if which branches depend on
0:17:30
which other future branches
0:17:33
in terms of the functionality because
0:17:35
we're so far behind on merging
0:17:41
it would take like a really really long
0:17:44
time i say we just
0:17:46
we just merge everything into dev and
0:17:52
problems like we encounter
0:17:55
yes we are intestinal detective i think
0:17:57
after we do some merge
0:18:05
so yeah let's do the
0:18:08
let's go with the latter
0:18:13
merge all the branches except the
0:18:22
and then test it yeah i think the vpc is
0:18:29
we probably don't need vpc at the moment
0:18:34
okay so should we just
0:18:36
start with a particular branch and merge
0:18:41
just yes so we have already
0:18:44
managed websocket uh in integration i
0:18:48
didn't i didn't i just no i didn't get
0:18:50
pulled we didn't do the merge yet
0:18:58
start with the websocket branch because
0:19:00
that's i'm pretty sure was the
0:19:03
earliest branch that we made
0:19:08
work our way through the other ones
0:19:14
uh what does it get um
0:19:17
so if you wanna basically push this one
0:19:22
as in by committing yes
0:19:25
there's nothing to commit i just pulled
0:19:28
there's no ah you just put okay
0:19:32
cool yeah then yeah merge
0:19:38
what's my opinion on waterfall
0:19:46
okay dev there is a kind of uh
0:19:50
old approach of software development
0:19:59
took without realizing
0:20:02
and it shouldn't have been the case
0:20:07
so yeah my overall opinion in
0:20:11
would be there we should avoid it
0:20:16
as much as possible
0:20:18
um so zane i'm going to do git merge
0:20:24
that's web socket integration okay so
0:20:27
this is the command right
0:20:58
that's nice well that's one that's one
0:21:00
of many literally geniuses man
0:21:03
all right should i push should i should
0:21:06
i commit these changes now
0:21:21
when you push them
0:21:27
websock integration into dev
0:21:40
push it i think it might tell us if
0:21:43
there's any merge com no there shouldn't
0:21:45
be any really good if there were you
0:21:49
sort of shouted at us in the terminal
0:22:06
i actually can't believe how much of the
0:22:08
geniuses we have oh oh well i'm i'm not
0:22:11
holding my breath man
0:22:14
i'm waiting for the conflicts
0:22:23
tribal to integrate
0:22:30
don't i okay do i just do
0:22:36
okay so i merged it and now i just want
0:22:46
you shouldn't have to do a commit just a
0:22:51
oh that's why it push wait i thought you
0:22:56
said i need a commit message
0:22:59
but so just you get push
0:23:10
and i need to take my i need to take
0:23:12
another get course again
0:23:15
uh protected branch hook declined
0:23:19
ah so have i actually allowed you to oh
0:23:24
it needs an approval
0:23:27
you don't have to trust me
0:23:33
known that you're gonna do that
0:23:39
that makes sense okay
0:23:41
that's good all right i'm happy that's
0:23:52
uh where's my branches
0:23:56
there's my branches
0:24:01
same api branches yeah that's my branch
0:24:17
collaborators and teams
0:24:25
um how did i do the
0:24:30
branches ah here we go
0:24:33
branch protection okay so i'm gonna uh
0:24:37
remove the permission on the dev branch
0:24:49
you'll regret that
0:24:53
i require pull requests before managing
0:24:57
require approval no require review from
0:25:03
okay cool so are you sure about that
0:25:11
require purpose from
0:25:15
dude i don't know why i'm in the real
0:25:18
zone at the moment
0:25:21
i require a pull request before merging
0:25:25
nope at the moment we don't want that
0:25:29
per request before matching yeah okay
0:25:32
okay cool tori i'm trusting you now
0:25:36
after every push you do i'm gonna lock
0:25:51
let me get rid of this thing here and
0:25:53
let me let me full screen this voila
0:25:55
okay i am applying the
0:26:03
why i'm gonna do more pushes
0:26:10
hey man if you want to sit there and
0:26:11
click the button every time go for it
0:26:15
i don't actually mind though
0:26:19
okay here we go you like the
0:26:23
you're power you're addicted to power
0:26:40
what are you trying to do now i wanna
0:26:46
why is it stuck there on focus
0:26:50
i just want oh geez
0:26:54
i wanted to full screen my
0:26:56
my vs code the the the bar was annoying
0:27:13
am i stuck on some
0:27:21
why is vs code being annoying there it
0:27:39
back in the seat backing back on the
0:27:48
it's it's it's only slow when i stream
0:27:51
it's only slow when i stream
0:27:54
i feel like it's the it must be because
0:27:58
the processor is just too old there's no
0:28:04
um sorry invest in a laptop come on i
0:28:08
know you go you can do this i believe in
0:28:14
no money the money for that right now
0:28:29
this is why i start vs code before i
0:28:48
what'd you do today what were you up to
0:28:50
how was your day zane
0:28:53
my day's been pretty productive
0:29:12
which branch should we attack next
0:29:15
so the branch that we should attack next
0:29:20
can be so we have done that one
0:29:23
a staple backhand when so websocket
0:29:29
creates uh when was the websocket branch
0:29:37
uh on 27th of december
0:29:47
then when which one was
0:29:52
after this stable backhand
0:29:57
why is it asking me comparing pull
0:30:03
no that's not the one
0:30:06
okay huh what's this pull request about
0:30:24
the lock too quick
0:30:26
oh no it's it's tim it's old master
0:30:30
right right bro um
0:30:32
don't do it to master yeah yeah it's
0:30:36
i wish it told you that
0:30:40
before you click on it
0:30:47
that would be nice if they did that okay
0:30:50
so stable backhand we don't need that
0:30:54
we need reflexes saving
0:30:57
get board functionality yeah um so the
0:31:02
would be get bought functionality
0:31:08
okay yeah i think i'm pretty sure about
0:31:13
created on the 4th of jan yeah
0:31:17
get bored functionality
0:31:25
i'm just gonna check and see if there's
0:31:27
anything i need to pull
0:31:33
there's that other one i was behind on i
0:31:38
and i would hate to push some old i will
0:31:42
hate to earn some merge some old code
0:31:47
let's say that's the last thing we want
0:31:49
to do overwrite the new code with the
0:31:54
i'll say good luck guys i'm i'm done
0:31:59
all the best thing it was a nice looking
0:32:02
review it was fantastic
0:32:18
wow my terminal so slow
0:32:28
being painfully slow today um it was
0:32:36
get bored functionality
0:32:39
i can't spell that
0:32:43
rarely spelled my own name
0:32:56
yeah because it's the back end
0:33:07
i'm actually really surprised that we
0:33:09
are not having any merge complex well
0:33:11
that other one was big so that is
0:33:13
surprising this one is tiny
0:33:16
the other one had like a package uh
0:33:20
lock file in it too i
0:33:22
saw that's right that's all that's uh
0:33:26
okay hang on i'm gonna
0:33:29
actually i'm coming up oh
0:33:32
this is petty now this isn't just
0:33:35
you give a man a little bit of power and
0:33:38
this is what happened yeah yeah you
0:33:40
deserve a little bit of power
0:33:44
okay the power this is an authoritarian
0:34:10
and next one would be
0:34:32
yeah that's the one okay
0:34:35
and there's that one should be a small
0:34:38
one as well i think
0:34:45
see how much practice you're getting
0:34:50
no no i just click around
0:34:56
i only do it for you man because i love
0:35:00
i'm honest man i'm really privileged
0:35:04
that you're doing this for me
0:35:07
for us for all coders
0:35:12
well if you're talking about working in
0:35:14
the terminal to do good stuff yeah i
0:35:16
almost never do it
0:35:41
so far i mean i think it's gonna be good
0:35:44
i don't think we have any merge
0:35:47
already up to date
0:35:50
how can that already be up to date
0:35:56
up did you already do a merge
0:36:05
somebody else merged it
0:36:19
do you want to go going i wonder if
0:36:21
that's why i was behind
0:36:28
my couple punch nuts how can we see the
0:36:31
mergers can we see the mergers but
0:36:35
is there as in common merge brian yeah
0:36:44
how can the board pass code already be
0:36:48
let's try that again that's weird
0:36:51
this board passcode right get merged
0:36:56
should your branches up today with
0:37:04
maybe i'm just too fast for my terminal
0:37:12
this is really interesting
0:37:20
or maybe i already once sunday i already
0:37:25
did the merge full passcode that's what
0:37:28
i was trying to look through in the
0:37:30
commit history but i don't i don't see
0:37:35
uh hashes the passcode by
0:37:38
oh he's there hash is the passcode on
0:37:41
board creation verify password
0:37:44
wouldn't it say merge branch blah blah
0:37:48
because it doesn't
0:37:49
github automatically does that for you
0:37:56
let me um if you don't mind i'll go here
0:38:00
yeah let's see if there's
0:38:09
yeah here huh that that was also in dev
0:38:14
maybe you accidentally pushed it to dev
0:38:20
uh convar is saying change to board
0:38:22
passcode and do a get remote v
0:38:28
should we give that a shot
0:38:31
go for it thanksgiving
0:38:42
so first of all what is yeah that's fine
0:38:46
it's set to zayn's fork i thought i saw
0:38:48
a board password upstream was set to
0:39:06
upstream board passcode
0:39:11
have you got any other ones good oh here
0:39:14
we go that's the one as well board
0:39:18
oh that's the local isn't it upstream
0:39:22
have you got any in the or region that
0:39:24
says board passcode
0:39:27
not that i can tell
0:39:31
that's interesting
0:39:43
it does say your branch is up to date
0:39:45
with upstream board passcode
0:39:50
maybe i have my ziploc card remember now
0:39:53
yeah and this is hash's yeah this is the
0:39:58
it's not like some weird thing
0:40:01
yeah yeah it must be then
0:40:07
okay yeah that's fine okay so
0:40:14
when i go to when i i'll go to dev here
0:40:17
and we'll be able to see if the passcode
0:40:20
like decrypt right it should just be
0:40:28
okay cool then of course
0:40:33
yeah i must have done it but i can't
0:40:36
hit remote v will tell you if it's
0:40:39
the roar coders upstream or a fork thank
0:40:43
oh that that really helps convo
0:40:47
thank you i wish i remember that old get
0:40:51
convar was talking about because now i
0:40:54
totally forgot i was reading it and then
0:40:56
i was like i don't
0:40:57
i don't understand and then i forgot to
0:40:59
look it up again and give it more time
0:41:05
so that makes sense
0:41:07
yeah that's all right that's all right
0:41:11
all right um okay cool so board passcode
0:41:15
um now we want to move on to
0:41:18
refactoring saving notes and that's the
0:41:26
refactoring saving notes
0:41:31
did you guys finish this last night yeah
0:41:44
yeah i don't see anything but just
0:42:01
mm-hmm all right it didn't update the
0:42:13
have you already pulled it yeah i didn't
0:42:19
as i did it here it says all right um
0:42:31
let me just make sure now
0:42:34
maybe like maybe i was too fast
0:42:58
all right yeah that i mean there are no
0:43:01
there is nothing to pull
0:43:07
but you're on death at the moment
0:43:10
now i'm back to dev
0:43:15
no don't pay attention to what was in
0:43:17
here because if i click on the ui
0:43:19
if i if i use the gui
0:43:21
oh all right okay i see okay here until
0:43:24
i type another command
0:43:30
but yeah that's a good thing to point
0:43:41
accounting 95 lines
0:43:47
we haven't experienced even a single
0:43:49
merged conflict wow
0:43:54
yeah yeah that's tourism magic fingers
0:43:58
oh you're not there no i'm just happy
0:44:02
we all managed to pull that off
0:44:04
i bet in your mind you were like kept
0:44:06
pushing that off kept pushing that off
0:44:08
because you didn't want to deal with the
0:44:16
okay cool so now what we can do um since
0:44:19
all of these are up there
0:44:26
shouldn't we delete the branches
0:44:33
anything happens um i want the branches
0:44:48
just go to the front end and just
0:44:52
test it once and for after the front end
0:44:54
merge is done as well
0:45:08
can you open a file
0:45:11
and i'll apply the lock to the back end
0:45:25
why is it being like that so weird
0:45:35
that's weird it's like getting it's like
0:45:37
getting stuck on full screen and i don't
0:45:50
time to invest worry time to invest
0:46:03
that's i don't think i can do it
0:46:08
honestly it's not going to help unless i
0:46:10
get a i got eight gigs of ram this
0:46:21
8th gen i5 so it's pretty old by now
0:46:25
unfortunately for this type of stuff for
0:46:32
that's right you get there
0:46:36
yep once i go back home it'll be easy
0:46:38
because i already have stuff
0:46:45
i don't know why like
0:46:47
not the f11 key is not working
0:46:54
all right scrambler enhancement
0:47:01
yeah why not oh i don't want to open a
0:47:03
file i want to open the
0:47:08
that's it show's over
0:47:13
i'll enjoy hanging the hanging running
0:47:15
the debugger whenever i click f11 this
0:47:21
maybe when you figured out how to do the
0:47:28
terminal up and down it messed up the sh
0:47:40
because i've been doing this all day
0:47:44
anyway yeah i'm just taking a guess
0:47:49
f5 runs the debugger
0:47:53
not f11 i don't know why that's weird
0:47:55
all right i'm stuck
0:47:57
um i can open the folder this way though
0:47:59
for the command palette
0:48:13
control k control oh that's the
0:48:48
all right that is looking good now
0:49:04
toggle full screen is shift alt 0
0:49:18
looking at the keyboard shortcuts
0:49:22
or is it shipped out oh
0:49:25
that's not doing anything either
0:49:27
well it doesn't matter we're in the
0:49:36
i don't know i'm still i'm still stuck
0:49:39
like if you take your cursor right at
0:49:44
no i can't because i i hit f11
0:49:48
yeah it's okay it's whatever sorry
0:49:51
just move on it's being buggy
0:49:54
it's probably a vs code bug
0:50:04
there's no bugs in it somebody else's
0:50:09
okay so we can start off with connect
0:50:20
there's a connect okay
0:50:33
you probably want to get
0:50:36
uh what changes have you got
0:50:45
oh that was that was when i tested the
0:50:48
wow yeah that's fine
0:50:50
let's get rid of that
0:51:00
have you ever heard a boston accent
0:51:17
how can you tell the different
0:51:20
difference between vaccines in the u.s
0:51:24
because i ain't talking like this
0:51:48
yeah you're like a real
0:51:55
bostonian from southwest right
0:51:58
you would have a really heavy accent
0:52:02
right right like in new york new yorkers
0:52:05
they have like a real born and raised
0:52:07
new yorker as an accent too
0:52:10
interesting what dog
0:52:35
interesting but there's different types
0:52:37
there's like uh new york italian
0:52:42
that's like you know
0:52:44
a more famous accent i think all right
0:52:47
let's get back to this
0:52:54
kid check out webs socket it looks
0:53:06
do you have to get rid of the launch
0:53:11
no it's for me because you
0:53:17
no it was the change to ah okay right
0:53:21
the other file because it's using that
0:53:24
all right i said yeah
0:53:26
it says it's up to date but i'll just
0:53:31
all right um check out
0:53:35
did you give me permissions sir well you
0:53:38
oh yeah yeah i need to do that for call
0:53:43
no you just wanted to see
0:53:52
it doesn't like my launch jason
0:54:05
that one was i guess you
0:54:07
created when you were doing local
0:54:11
okay yeah i'm just getting rid of this
0:54:13
because if this is already here it's the
0:54:20
i don't i think i pushed those i thought
0:54:22
maybe it'd be useful for you fellas
0:54:26
yeah um just check out the
0:54:41
wait who are you now
0:55:01
wait did i have this local is this a
0:55:11
because that's what i'm thinking there
0:55:12
might be a false version ever let's get
0:55:19
oh actually i think i want that
0:55:30
how come there's no local changes to
0:55:39
i want to stash this
0:56:04
you probably want to unstage it first
0:56:07
and then stand you
0:56:11
you probably want to unstage it first
0:56:17
uh i tried and it didn't let me
0:56:41
that's for my workspace
0:56:50
still doing it okay cool there we go
0:57:02
hold up i don't think there's anything
0:57:05
to pull let me just check
0:57:10
and then git merge
0:57:14
what was it websocket
0:57:18
minus websocket okay
0:57:35
all right that's good
0:57:41
okay and the next one would be for us
0:57:45
no let me push it wait what
0:57:48
why is it saying sync changes
0:57:54
did i just merge it oh i gotta push it
0:57:59
you need to push it
0:58:01
i thought i did i think i just merged it
0:58:03
i'm getting ahead of myself
0:58:11
that's brilliant all right
0:58:14
and now we want to do which one
0:58:23
get bored functionality
0:58:36
wait can we just do this one
0:58:38
oh no i think it's the same this is
0:58:42
yeah it's is it name the same branch
0:58:48
all right it is up to date
0:58:53
okay paul let's check
0:59:05
i'm gonna misspell this
0:59:14
can i just copy the name now
0:59:19
all right if i make it
0:59:21
make a typo i'm gonna be upset
0:59:43
okay cool pretty sizable
0:59:56
okay that's done what's next
0:59:58
q and the next one
1:00:07
passcode ui prompting
1:00:14
says it's up to date but okay just check
1:00:39
already it's already
1:00:43
you must have done that okay yeah i must
1:00:45
have done i must have done that and then
1:00:48
i forgot just try that one more time
1:00:54
what's next oh code police
1:01:02
okay the next one would be
1:01:06
do you think those sirens are a
1:01:08
harbinger for what's
1:01:19
sound as you've reported emerge conflict
1:01:22
we are here to catch the
1:01:25
conflict as opposed to where is it yeah
1:01:28
it's 7 35 and if there's about to be a
1:01:31
merged conflict i'm leaving it up to you
1:01:37
to be honest i'll i'll probably call it
1:01:41
and he would i'll say
1:01:50
github actions as free crcd
1:01:54
shall we do that as well
1:01:56
that one was already good i did that
1:01:59
okay perfect back in the day
1:02:04
auto complete on the terminal jeez
1:02:08
so that means we don't need to do that
1:02:14
um there's a branch called get
1:02:18
so there's a branch cool okay
1:02:22
not as annoying as my dog
1:02:28
pull this is the last one prompt pin
1:02:34
yes this would be the last one yeah the
1:02:37
the other one i think is already merged
1:02:42
uh i was talking about the
1:02:49
would then need to be merged in dev as
1:02:55
um merged into dev
1:02:58
is it not merged into dev
1:03:01
i think it is i think i merged it into
1:03:05
dev yeah it's in dev
1:03:09
so this is the last one and then we can
1:03:19
we can call out right wait
1:03:37
i am so happy there is zero merge
1:03:42
that that's gonna put me to bed tonight
1:03:46
true true if there was i would be
1:03:49
stressed i don't like them
1:03:53
i guess no one does that not even an
1:03:55
extra line that's great
1:04:07
okay perfect so that would be it for
1:04:15
which is fantastic oh yeah not even a
1:04:18
single most conflict
1:04:22
do you want to do the honors
1:04:27
um both the back end and the front end
1:04:30
into their respective dev branches and
1:04:36
no merge conflicts
1:04:38
so it went extremely well it was a very
1:04:44
and um if you wanted my browser
1:04:52
well eventually eventually got there so
1:04:56
which was fantastic
1:05:00
we will be taking the next step
1:05:04
so if you want to check us out what do
1:05:07
we have in the box for you guys tomorrow
1:05:10
feel free to join in at same time same
1:05:17
that is exactly what's gonna happen all
1:05:20
right guys have a good night and
1:05:23
thanks for joining
1:05:24
thanks for joining us everyone thanks
1:05:26
convar thanks gekko have a great night
