Interpolation problems in YsabeauInfant-Italic[wght].ttf

[behdad]

Hello!

This is an automatically-generated report about possible interpolation problems in YsabeauInfant-Italic[wght].ttf, as found in the Google Fonts catalog.

To download a PDF version of this report with helpful visuals of the problems, click here; Or to view it on the GitHub website, click here.

The report follows:

Glyph uni030A0301 was not compatible:
  Masters: '', 'wght=1000.0':
    Contour 2 interpolation is underweight: '', 'wght=1000.0'

This report was generated using the fonttools varLib.interpolatable tool. We understand that sometimes the tool generates false-positives. Particularly for more complicated font designs. If you did not find this report useful, please accept our apologies and ignore / close it.

To give feedback about this report, please file an issue or open a discussion at fonttools.

Please note that I am doing this as a community service and do not represent Google Fonts.

[CatharsisFonts]

Huh, looks like there's an old version of the acute stuck in the lighter masters of ringabovecomb_acutecomb in Ysabeau Italics. I fixed it locally, but then remembered I should have git pulled first.
I'm now back at this stage where I screwed things up last time:
(base) [Andromeda: GitHub] $ git pull
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
(base) [Andromeda: GitHub] $
@behdad, what should I do to resolve this without screwing up the repo again? Stash, probably?

[behdad]

You can try stash but that might still get you in a merge conflict...

Note that I'm testing the version of the font in the Google Fonts repo only. So if you fixed this recently it might not have reached there.

[CatharsisFonts]

sigh So how do I avoid a merge conflict? Can I discard all changes since the last commit and then pull?
xkcd summed it up perfectly:
https://explainxkcd.com/wiki/images/4/4d/git.png

[behdad]

If you want to discard all your local changes do a git reset --hard. But make sure that's what you really intend.

[CatharsisFonts]

Oh wait, it looks like I'm not even out of date with my local instance. I just assumed it was the case because you seemed to be working on it, and when I git pulled and got an error message. I guess I can afford to commit and push, then. Sorry for the hassle. I'm just not cut out for working with git.
EDIT: Yep, all good.