Do you track dice during a reroll?

By robguyday, in Star Wars: Destiny

Played a game last night. Two gamorrean guards, one with 3 health left. One with 6 health left.

I had a Chewbacca special showing, he had two gamorrean guard dice showing disrupt. He discards to reroll. I say that he should reroll them separately so that we know which dice goes to the least healthy Guard. He argues that he rerolls and gets to choose which dice goes where.

who is right?

He need to track those if game situation requires it.

Quote

If a player has two copies of the same upgrade on different characters (one upgrade on each character), they must make sure to track each die separately.

If you need to track upgrades separately, characters aren't even topic for discussion for him.