search

calzada / PARLAMINT-ES-MC

2 stars 4 forks source link

Reorder and include scripts #1

Closed TomazErjavec closed 3 years ago

TomazErjavec commented 3 years ago

Well, I hope this works, I don't have much experience with pull-requests:

There are still many things to do, but they mostly concern adding metadata to the teiHeader files. We can resolve that via issues, if you accept this pull request. Or email, or Zoom!

calzada commented 3 years ago

Excellent. I will have a detailed look this week-end.

Plus... I have moreeeeeee material almost ready!!!

Best and many many thanks, Tomaz.

I have no words to thank you enough. I have met many good professionals and you are certainly among them.

Best for now,

mc

El vie, 5 mar 2021 a las 19:42, Tomaž Erjavec (notifications@github.com) escribió:

Well, I hope this works, I don't have much experience with pull-requests:

  • I moved your files to CD directory
  • I included scripts that I wrote to covert your format to ParlaMint
  • and ran them to produce ParlaMint files in ParlaMint folder.

There are still many things to do, but them mostly concern adding (meta)data to the teiHeader files. We can resolve that via issues, if you accept this pull request. Or email, or Zoom!

You can view, comment on, or merge this pull request online at:

https://github.com/calzada/PARLAMINT-ES-MC/pull/1 Commit Summary

  • Move files to CD directory.
  • Add scripts.
  • Add output files.
  • Remove files from tmp

File Changes

Patch Links:

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/calzada/PARLAMINT-ES-MC/pull/1, or unsubscribe https://github.com/notifications/unsubscribe-auth/AA2AREV34OTIC5HVJWOYYRTTCEQ2PANCNFSM4YVWOZXQ .

-- María Calzada Pérez Universitat Jaume I Castellón de la Plana

calzada commented 3 years ago

Tomaz, I conflicting file (cd.dtd) and I am unable to merge your directory with mine.

Any idea how to solve this conflicting file?

Captura de pantalla 2021-03-05 a las 21 08 30
calzada commented 3 years ago

Dear Tomaz, I am so sorry to bother you. I have a conflicting file. SO I thought I could download your director (in a zip) and then create delete the PARLAMINT-ES-MC again but now with your data. I will give it a different name now. PARLAMINT-ES-MC-ERJAVEC so that you can erase the older directory and fork the new one. And we can take it from there.

Does this sound plausible. In the meantime I have downloaded your directory in my computer.

Can you let me know what I have to do next?

I am finishing a second load of files (another legislature). I would ideally aim for the 2015-2020 period (which is what everybody has). But this will entail some work. SO do you want me to do something before the new load of files.

best for now,

mc

Is this alright? I will tell you when I do so,

El vie, 5 mar 2021 a las 19:42, Tomaž Erjavec (notifications@github.com) escribió:

Well, I hope this works, I don't have much experience with pull-requests:

  • I moved your files to CD directory
  • I included scripts that I wrote to covert your format to ParlaMint
  • and ran them to produce ParlaMint files in ParlaMint folder.

There are still many things to do, but them mostly concern adding (meta)data to the teiHeader files. We can resolve that via issues, if you accept this pull request. Or email, or Zoom!

You can view, comment on, or merge this pull request online at:

https://github.com/calzada/PARLAMINT-ES-MC/pull/1 Commit Summary

  • Move files to CD directory.
  • Add scripts.
  • Add output files.
  • Remove files from tmp

File Changes

Patch Links:

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/calzada/PARLAMINT-ES-MC/pull/1, or unsubscribe https://github.com/notifications/unsubscribe-auth/AA2AREV34OTIC5HVJWOYYRTTCEQ2PANCNFSM4YVWOZXQ .

-- María Calzada Pérez Universitat Jaume I Castellón de la Plana

TomazErjavec commented 3 years ago

I haven't done a conflict resolution on a pull request, but, no, making a new respositry is not the best way, I think. There is a ? button on your screen, and it presumable tells you what do to - you might have to install https://desktop.github.com/ or something similar. In general, the conflicting file gets markers in it so you see where the conflict is, and you edit it keeping those changes that are appropriate. Not too hard, maybe read some documentation and try! cf. https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line

TomazErjavec commented 3 years ago

Or, you can give me write access to your repo, and I can try to do it.

TomazErjavec commented 3 years ago

OK, looks like merge has been done, phew! :) And now we can start serious work!