Reputation: 325
Two weeks ago I had some Git merging issues due to what I think, rebasing to a old version. I didn't notice it at first, I noticed that my whole folder was screwed up to an outdated version.
After some struggle I managed to get back to the clean state I was before. However, today I noticed one folder had deleted files prefixed with "~$". I can't open them and I know they're outdated. I also see a file called: "~WRL0005.tmp" which I didn't have before.
Does any one know what this means? And does this possibly mean that there's somehow still a danger to fall back to an old version of my repo?
Upvotes: 1
Views: 4372
Reputation: 1323613
You should:
.gitignore
file with Microsoft Word ignore rulesFor instance:
*.tmp
# Word temporary
~$*.doc*
# Word Auto Backup File
Backup of *.doc*
That way, you are sure no more of those files will be added by mistake to your repository.
Upvotes: 2