XML Poem Mark-up Changes

[kes213]

Hi, guys,

So, I went into our Relax NG Schema and edited it a little bit. @ebeshero suggested to me that we make a few changes to our mark-up, so those changes are reflected in the schema now.

Mainly, the change is that the stanzas are no longer marked as attributes. Instead, stanzas are their own element, wrapping around groups of lines.

You'll need to re-associate the Relax NG Schema and the Schematron documents with each poem because I changed their location in the directory to make sure there was only one copy of each.

Also, I noticed that some poets don't have ten poems. Liz, I know you said you were having problems finding 10 poems for one of the poets, so go ahead and pick another Harlem poet and find 5 poems for that poet and 5 for the original poet, if that makes sense?

Remember that we're marking figurative language and punctuation in the poems, too. Some of them are still missing that.

Basically, just start editing your poem XML documents so the schemas are both green for you!

Let me know if you have any questions.

[kes213]

@tal80 @flowerbee1234

I just fixed all of the McKay poems, so if you need an example, open any of the XML documents in that folder and use that.

I think we should try to get this done ASAP.

@ebeshero

[kes213]

@tal80 @flowerbee1234

How are your XML markup changes coming?

We should have those all done by the end of the week (Friday, November 17).

[flowerbee1234]

I just wanted to let you guys know that I did all the work I was supposed to do, but I am having the worst time with the Git push. Any way I can just send it to you and you can help me out?

--Liz

---

From: Kaylee Stinebiser notifications@github.com Sent: Monday, November 13, 2017 2:18:22 PM To: kes213/Harlem_Ren_Project Cc: Laughlin, Elizabeth Anne; Mention Subject: Re: [kes213/Harlem_Ren_Project] XML Poem Mark-up Changes (#7)

@tal80https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Ftal80&data=01%7C01%7Ceal63%40pitt.edu%7Cd2adb1018b4c4062d19608d52acb4f9a%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=fs4rAI%2Bq93KApj5WU7fpytOlaMtsjPeaGvumq%2F3x4Sc%3D&reserved=0 @flowerbee1234https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fflowerbee1234&data=01%7C01%7Ceal63%40pitt.edu%7Cd2adb1018b4c4062d19608d52acb4f9a%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=CQCCh%2Bx3e80ILEIA%2Bryqsr%2B%2BWr89zVberU6ESRSoETs%3D&reserved=0

How are your XML markup changes coming?

We should have those all done by the end of the week (Friday, November 17).

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fkes213%2FHarlem_Ren_Project%2Fissues%2F7%23issuecomment-344027126&data=01%7C01%7Ceal63%40pitt.edu%7Cd2adb1018b4c4062d19608d52acb4f9a%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=ocpzkvn8ukuYcZgUT3YrX9fGUAjlB8T6hKYRR7mqJKQ%3D&reserved=0, or mute the threadhttps://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAeBcLSvXu06kfloCdXMLPdbsv8n3OEGcks5s2JX-gaJpZM4QRnBF&data=01%7C01%7Ceal63%40pitt.edu%7Cd2adb1018b4c4062d19608d52acb4f9a%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=faZlO6G%2BlKRdEDWP9bdGblpxRmU0wz1DtJrUfxsSGPI%3D&reserved=0.

[ebeshero]

@flowerbee1234 What's the problem you're having? Can you meet with @jonhoranic this afternoon to help you with the git push? He starts, I think around 2pm in downstairs FOB. I'm out of class at 3pm, and both of us are around a few hours this afternoon--we can help.

[flowerbee1234]

Maybe you guys could help me via email, because I have a quiz in Renaissance lit that I'm studying for. Thank you, though!!

Basically, I updated the XML to fit the new schema and RNC, but it's saying that since I kept them the same name, that I made no changes. My bro has been helping me here and there through FB messenger, but even he is not sure why it won't push.

---

From: Elisa Beshero-Bondar notifications@github.com Sent: Monday, November 20, 2017 1:11:30 PM To: kes213/Harlem_Ren_Project Cc: Laughlin, Elizabeth Anne; Mention Subject: Re: [kes213/Harlem_Ren_Project] XML Poem Mark-up Changes (#7)

@flowerbee1234https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fflowerbee1234&data=01%7C01%7Ceal63%40pitt.edu%7Cc7a9906a176343c1fb7c08d530422098%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=nd97i%2Fw8nalq2QkukTWZ4MGQG5rheVkVdJFREIUzTlU%3D&reserved=0 What's the problem you're having? Can you meet with @jonhoranichttps://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fjonhoranic&data=01%7C01%7Ceal63%40pitt.edu%7Cc7a9906a176343c1fb7c08d530422098%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=0abFhULwnigMzpCdSKjtBgZURtG7yuYEKoM%2FUkxBlmw%3D&reserved=0 this afternoon to help you with the git push? He starts, I think around 2pm in downstairs FOB. I'm out of class at 3pm, and both of us are around a few hours this afternoon--we can help.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fkes213%2FHarlem_Ren_Project%2Fissues%2F7%23issuecomment-345780527&data=01%7C01%7Ceal63%40pitt.edu%7Cc7a9906a176343c1fb7c08d530422098%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=aeBOnAGXqFW6KiBatfvntg7pFoo27kFlPdOUKByUKT0%3D&reserved=0, or mute the threadhttps://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAeBcLQ19uht7N2OsaVYA9qEHVmg0d8Yfks5s4cDSgaJpZM4QRnBF&data=01%7C01%7Ceal63%40pitt.edu%7Cc7a9906a176343c1fb7c08d530422098%7C9ef9f489e0a04eeb87cc3a526112fd0d%7C1&sdata=aa8zMwKw60yMaeBvWIE6TvXU6TFlQP2kMEj6ccuv1U8%3D&reserved=0.

[ebeshero]

@flowerbee1234 I imagine you've got a merge issue--that you need to pull in updates that your team has pushed to the repo, but those changes might overwrite the work you did. Assuming I've understood this right, here's what I'd do:

First of all, you may want to make a copy of your files outside the repo, just in case you need them in their current state later. Make the copy (maybe on your desktop), and leave it alone--and go back to your local git repo.

You want to make sure the GitHub repo is tracking the changes you made to your files: For this you need to enter: git add -A (that adds your changes so they are tracked by GitHub) git commit -a -m "make a commit message briefly describing your updates"

If you're stopped from this--if it won't accept your commit, tell us that now! We need to make sure Git knows your changes are serious and will accept your commit.

You probably can't make a git push because it's going to conflict with someone else's updates on repo--and I'm willing to bet that's the problem you're seeing. You may also not be able to do a git pull for the same reason--the repo is probably trying to get you to work on merging the remote with the local repo: (Note: this is likely to happen a lot in the next few weeks as you and your team are building your project, so it's important you get a sense of how this works.) Here's how to handle a merge:

After you've added and committed your changes (w/ git add and git commit -m "message") then try to do a git pull, and see what happens. It probably won't work the way you want--it may say that it needs to merge your commits with those coming in from remote. You may see a new window open up with a space to enter what we call a merge commit, and you're supposed to enter a commit message there. It's tricky to do because you can't use your mouse--it's a special editor called "vi" or "vim" that only lets you use the arrow keys on your keyboard to edit this (no mouse), and you can type a message that just says fixing merge or merging (and I think you can get away with not typing anything at all).

Exit this window with the following key commands: esc : wq (escape colon w q) and you'll get back to your terminal. Type git status and see what it says. If all went well, you should be able to push a few commits (one will be your changes, and the other will be the result of merging your changes with the others coming in from remotely.

If it doesn't go well, Git will tell you that some files require you to open them up and resolve areas it has marked that are in conflict--Try opening these files in oXygen and you'll see something like "tire tracks" or "skid marks" (what I call them): like this:

Start of the file....
>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>
VERSION 1
>>>>>>>>>>>>>>
VERSION 2
>>>>>>>>>>>>>
>>>>>>>>>>>>
...rest of the file

What's marked in the angle brackets is the conflicted zone, and you need to read it carefully, choose what to keep and what to set aside. You may seriously want some help from one of us to figure out how to resolve this, especially if it's your first merge conflict--and you may want some oversight from @kes213 or @tal80 about what's new in the files.

Well, I hope that gets you some direction on how to start. I'm in my office now if you want to take a few minutes to try to fix this.