The website is not building correctly (git pull stalled)

Dear all,

The website is not updating correctly.

https://www-master.debian.org/build-logs/webwml/git_update.log shows that
there are some local changes that are not committed thus "git pull" would exit
without doing anything.

From https://salsa.debian.org/webmaster-team/webwml
   69ba1b173fc..97729276414  master        -> origin/master
 * [new branch]              fight-entropy -> origin/fight-entropy
error: Your local changes to the following files would be overwritten by
merge:
	english/lts/security/ref-table.inc
Please commit your changes or stash them before you merge.
Aborting
Updating c234875ad36..97729276414
Command exited with non-zero status 1
1.40user 0.48system 0:05.41elapsed 34%CPU (0avgtext+0avgdata
85564maxresident)k
200152inputs+1040outputs (1921major+35852minor)pagefaults 0swaps


Is there any possibility that we do a "git reset --hard HEAD; git clean -xdf"
before actually "git pull"?

--
Thanks,
Boyuan Yang

-----BEGIN PGP SIGNATURE-----

iQJFBAABCgAvFiEEfncpR22H1vEdkazLwpPntGGCWs4FAlymRO8RHGJ5YW5nQGRl
Ymlhbi5vcmcACgkQwpPntGGCWs74YBAApgYGCLdcRQbSuici+yKxW//ILFlXTHuB
DW+YwsgUIkK8phYK3ULal8u3hs23IegtstoAJW75hMIDJVOAnxAcgTINPuFao13W
rMjNfdOWfpuBuYKcGN78+Mmx4x+kGaQGr3DYn4Id1Yy7afHhBomLKwh5UG/OLiv3
xk8/suzirLcTs3Joas8UQttDEa6G+05lohrW/NBqO7PpgevlsFhWyoNl7UZaVzj3
+N/L61PEczQGV5O1tL+3NSx86e6vBjFGgLmVsvWLoPdBDRcktd4e6ghqp0etkK7m
R2i9oW5YsrxPinD6lsrcum1Sp/MYijZeTTyo782iwF0jo5MK9FRUF+Vp+ec/I0gg
sb3+ZdOuX1ksZ7zarkKGlr95h9lT4jE9NVNRReYkMSjw8KlMLidx866WN5ZQDEIQ
sTmRW3beEs2sezhYjcn6z/RK7ArdtBergypWBNvZOcA2yLkGbUbTzXCZUvV1w2bM
1o2p+hIry/Ug5mffM7cMEASMbrhUfmuzbjwovPeek14YIENmlQNf4+fzASas0CUR
wi3alu55UFKVFb/2829Hjx5x/B40uK6ymK0/4jePjExDnUQHbUna8cG8BmV72K7R
3onygnzIcbohkcKXEd7cr//p+SxEe+qRdGr7HOK84yEj833pPwKyjYZo2Bskd2JO
aJAZhTO7QNY=
=TBeN
-----END PGP SIGNATURE-----