@jrss git does not "care" about the ".sync-conflict*" files and they can be safely deleted. If you want to be doubly sure, move them out into a temp folder, use git to verify functionality, and then delete.
I also use syncthing to sync repos and the rare conflict file is kind of a nuisance.
This Mastodon instance is for people interested in technology. Discussions aren't limited to technology, because tech folks shouldn't be limited to technology either!