search

Ethandaniel47 / EdgarAllanPoeProject

Analysis of language pertaining to capture/enclosure and release in regards to the poetry and prose of Edgar Allan Poe
1 stars 0 forks source link

Doubles? #16

Open khuber116 opened 5 years ago

khuber116 commented 5 years ago

While beginning to push my marked up poems I noticed that one of the poems I was supposed to do (Hymn) has already been done. My only question is, will something go terribly wrong if I try to push my file?

Ethandaniel47 commented 5 years ago

Did you look at the other file? If it's already marked then I wouldn't bother pushing at all

gabikeane commented 5 years ago

If they have the same filename in the same place, yes that could be an issue. It should cause a problem on your local machine, not in the master. Nothing can ever go terribly wrong in the master, that's the beauty of version control.

khuber116 commented 5 years ago

I pushed it but adjusted the name so it wouldn't cause any issues. I figured we can just go with whichever file is more consistently marked up when compared to the others.

djbpitt commented 5 years ago

@khuber116 \<oXygen/> includes a utility to compare XML files. Go under Tools and then Compare Files and select the two. You can tell it to ignore whitespace differences, so that it won’t be misled if the two documents have pretty-print differences that are not informational.