►
From YouTube: Updating a Figma branch behind main
Description
A walkthrough of how to triage changes in Figma when a branch has conflicts with main and updates that need to be applied.
This process makes use of the Visual Difference plugin from EightShapes, https://www.figma.com/community/plugin/1077953882260191737/Visual-Difference.
A
All
right,
I'm
gonna,
walk
through
what
I
hope
to
be
a
really
quick
demo
in
figma
I
have
a
branch
from
the
component
Library.
The
branch
is
behind
the
recent
update
to
the
component
Library,
and
so
there
are
changes
that
the
branch
has
that
that
main
doesn't,
and
likewise
there
are
changes.
The
branch
doesn't
have
from
the
recently
published
updates
from
Maine,
so
I
have
this
updates
available
from
Main
file.
A
So
before
I
begin,
I
I
know
that
these
changes
are
camellia's
addition
here
to
the
branches,
just
an
example
that
shows
select
all
unselect
all
so
that
we
can
have
a
binary
State
example.
What
I
want
to
do
is
just
copy
that
and
keep
that
for
now.
I'm
actually
just
gonna
place
it
in
a
separate
file,
but
I
also
still
have
that
in
the
clipboard,
where
I
could
paste
back
in
here
all
right.
So
what
I?
What
I'm
going
to
do,
then,
is
because
I
know
there's
going
to
be
some
differences.
A
A
A
All
right
so
initially
not
the
most
helpful
figma
window
ever
like
see,
there's
one
conflict.
It
does
not
highlight
what
that
is
for
me.
Having
known
that
that
this,
the
the
branch
example
is
what's
being
added.
I
am
aware
that
that's
likely
the
one
conflict,
but
what
I
can
do
is
just
go
ahead
and
start
top
left
here
and
start.
Comparing
you
can
see.
The
size
is
a
little
different
from
left
to
right.
That's
because
the
ones
added
and
figment
and
scale
them
up
there,
keep
them
at
100
percent.
A
So
obviously
this
side
is
not
100
percent.
Thanks,
figma
we'll
keep
going.
Okay,
there's
there's
branches!
You
can
see
now
that
I've
got
branches
here,
but
I
don't
have
branches
here
before
multiple
groups.
So
that's
the
difference.
However.
I
know
that
there
are
changes
from
Maine
that
I
could
bring
over.
A
But
let's
just
test
something
out
here
we
have
file
history,
so
I
can
go
back
I'm
going
to
keep
the
branch
because
I
want
this
Edition
next,
okay,
so
I've
updated
that
I've
kept
the
changes
in
the
branch
great.
But
now
here
are
the
other
changes.
There
are
33
non-conflicting
changes
from
the
main
file,
and
so
you
can
see
that
this
is
primarily
to
do
with
the
drop
down
and
all
the
instances,
which
is
that's
great.
There's
some
breadcrumb
changes
if
I
click
into
one
of
these.
A
A
A
All
right,
so
here's
a
difference.
The
latest
is
narrower.
That
is
the
exact
change
that
we
were
pulling
in
from
the
the
latest
updates
to
to
the
drop
down.
The
component
was
narrower
by
some
pixels,
so
we
can
highlight
the
difference
here
by
that
or
party
mode,
so
we
can
go
ahead
and
increase
that
and
see
that
our
dimensions
are
different.
A
A
A
So
that's
really
interesting
to
me,
though,
that
it
didn't
pick
up
some
of
these
all
right.
So,
let's
get
over
here,
we've
got
our
Branch.
What
is
what
has
changed
in
our
branch,
all
right,
so
some
positioning,
that's
about
all.
It's
looks
like
size,
Wise,
It's,
actually
narrower.
Okay,
all
right
good
deal
now
why
it
didn't
detect
all
of
these,
so
so
here's
what
I'm
looking
for
the
width
of
these
should
be
248..
A
A
A
A
A
A
A
A
A
A
This
is
what
I
was
looking
for.
So
you
note
that
there
the
addition
that
we
have
there
are
no
changes
because
it
doesn't
exist
in
this
file,
but
you'll
note
that
all
the
other
snapshots
are
changed,
so
keeping
main
is
is
probably
ideal,
but
what
I
had
to
do
first
was
copy
over
my
changes
and
bring
them
back
over.
So
all
of
these
are
narrower.
A
A
Actually,
let's
move
it
I
think
over
one
perfect.
So
we
know
that
it
was
next
to
Milestones
I
believe
it
was
right
in
this
area
kind
of
close
to
where
the
comment
is
but
I
guess
with
the
size
changes
that
is
probably
correct.
So
here's
our
branches,
one
thing
you'll
note-
is
that
this
is
248.,
so
this
has
actually
updated
to
use
the
correct
version
of
the
plug-in
where
over
here
it's
256.
I
dropped
it
in
it's
now,
258.,
so
I'm
comfortable
with
those
changes
now
it.
A
A
We'll
paste
that
I
should
actually
we'll
do
the
name
too
I
think
that's
the
name.
Let's
compare
all,
let's
see
if
it'll
I
don't
know
if
it'll
recognize
it,
it
probably
won't.
I
won't
do
that.
Okay,
so
that's
not
going
to
work
there
because
it
doesn't,
it
doesn't
think
it's
the
same
thing,
which
is
fair
all
right.
A
So
anyhow,
you'll
note
that
there
is
no
not
going
to
be
a
visual
difference
on
this.
That's
because
it
couldn't
be
found
because
we
updated
it
and
that
was
removed.
However,
you
can
see
that
all
the
other
changes
have
been
brought
over.
They
look
accurate
and
then
I
can
see
that
when
I
pasted
this
new
addition
back
in
it
also
was
accurate.
It
used
the
component
updates,
correct,
corrected
the
spacing
Etc
and
so
I
think
that
that
is
fantastic.
It
has
the
resizing
capability.
A
The
scrim
is
resizing
so
a
little
bit
of
back
and
forth
here,
but
that's
one
way
that
on
a
larger
Branch
I
work
through
just
sorting
out
the
changes
now
I'm
comfortable,
that
this
branch
is
updated
and
correct.
So
I
can
proceed
with
my
review
and
it's
up
to
date
with
Maine.
So
I
know
that
if
I
merge
this
back
in
I'm
not
going
to
be
introducing
any
other
changes,
delete
the
snapshots
in
just
as
a
a
proof
Point
here.
If
I
did
review
and
merge
changes.