search

JonathanReeve / sanger

Margaret Sanger Papers Project Search Engine
0 stars 3 forks source link

Proofreading #59

Open CathyHajo opened 9 years ago

CathyHajo commented 9 years ago

Also checking what happens when Esther and I made separate corrections to the same document 101856

JonathanReeve commented 9 years ago

07e6101 looks like a really big commit--over 1,000 files changed, it says. Many of the files added there seem to be invalid--files missing extensions, files with .xml.xml extensions, .bak extensions, or others. Those files might cause unexpected behaviors with the parser.

CathyHajo commented 9 years ago

I think that must have been when I copied the XML Drafts into my github version, because some of the files that I was working on were not in the master. Can we just get rid of that one?

JonathanReeve commented 9 years ago

Yep. Just click on the commit in GitHub for Windows and click the "Revert" button. I'd recommend importing missing files more or less manually, since copying them all over wholesale could cause unexpected behavior.

CathyHajo commented 9 years ago

Ah, that's not working either. Says that I have unmerged files in my directory. Resolve them and committ before trying the revert. Since I am supposed to get rid of my fork anyway, I'll just get the files that I have corrected in the last two days and get rid of the rest.