►
Description
No description was provided for this meeting.
If this is YOUR meeting, an easy way to fix this is to add a description to your video, wherever mtngs.io found it (probably YouTube).
A
A
So
this
was
an
idea
that
came
in
discussion
a
few
times
where
the
general
idea
is
that
it
would
be
nice
to
have
some
kind
of
warning
in
your
IDE
that
you're
going
to
get
into
a
merge
conflict
instead
of
pushing
and
then
going
to
the
IDE
and
going
to
get
lab
and
then
finding
out.
There's
a
merge
conflict
have
to
go
back
to
the
IDE
to
fix
it.
So
I've
created
two
scripts.
A
The
first
one
was
for
a
pre-commit
hook,
which
was
which
is
the
most
safe
one,
because
we
actually
have
our
work
committed
already.
So
it's
fairly
easy
to
do
that,
then.
The
next
logical
step
was
to
do
it
also
for
pre-commit,
but
we
can
do
it
with
the
git
Mercury.
A
Thanks
to
Chris
for
pointing
me
in
the
right
direction.
So
I've
checked
recommit.
It
will
do
a
few
things
like
in
general.
It
will
determine
the
origin,
in
this
case
its
origin
and
the
default
Branch.
So
here
you
can
see
the
output,
the
origin
is
origin,
the
branch
is
master
and
the
verdict
is
that
it's
good
to
merge,
so
it
only
checks
for
the
stage
changes
not
for
the
unstaged,
which
is
exactly
the
objective
of
a
pre-commit
hook.
A
A
I
don't
get
the
impression
that
there's
a
lot
of
enthusiasm
for
this,
so
I'm,
not
sure
if
I
should
proceed
with
putting
it
into
a
fierce
code
extension
so
yeah,
that's
the
functionality,
pre-commit
and
pre-push
used.
However,
you
like,
if
you
don't
and
also
find-
and
let
me
know
your
thoughts
if
we
should
integrate
this
into
the
IDE,
then
the
third
point
that
I
wanted
to
quickly
mention
is
I'm,
also
exploring
tools
and
ideas
for
a
new,
seg
and
I
hope
to
have
a
video
on
that
next
week.
A
I
think
I'm,
just
gonna
do
three
minute
videos
on
each
idea:
I,
probably
won't
post
them
in
this
playlist
I'll,
just
link
them
and
post
it
on
our
snack
Channel.
Thank
you
for
watching.
If
you
have
anything,
you
want
to
share,
leave
a
comment
down
below
or
contact
me
on
Slack.