search

erc-dharma / tfc-khmer-epigraphy

This repository assembles data produced by the project Corpus des inscriptions khmères (before and during the DHARMA project).
https://dharma.hypotheses.org/
Creative Commons Attribution 4.0 International
2 stars 0 forks source link

K0080.xml #19

Closed ajaniak closed 3 years ago

ajaniak commented 3 years ago

Dear @chhomkunthea,

There is a version conflict on your file K0080.xml. It starts with such a pattern <<<<<<< HEAD and says that 2 versions of the same part of the file coexist. Can you check it and keep only the one you want in the file? Note that there are currently 2 conflicts in the file: one in the apparatus and one in the translation. Thanks for your help

arlogriffiths commented 3 years ago

Since Kunthea has probably never yet resolved such a conflict, she may need help.

Could you arrange a skype/zoom session?

Le 12 nov. 2020 à 09:49, ajaniak notifications@github.com<mailto:notifications@github.com> a écrit :

Dear @chhomkuntheahttps://github.com/chhomkunthea,

There is a version conflict on your file K0080.xml. It starts with such a pattern <<<<<<< HEAD and says that 2 versions of the same part of the file coexist. Can you check it and keep only the one you want in the file? Note that there are currently 2 conflicts in the file: one in the apparatus and one in the translation. Thanks for your help

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHubhttps://github.com/erc-dharma/tfc-khmer-epigraphy/issues/19, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AAGMAE3CUHJB45OCRPTBQE3SPOOR5ANCNFSM4TS7X3FQ.

chhomkunthea commented 3 years ago

Dear Axelle and Arlo,

I’ve solved the problems of K. 80.xml and pushed the file on Github. It’s green now; hope that it’s alright.

Best, Kunthea

Le 12 nov. 2020 à 16:02, arlogriffiths notifications@github.com a écrit :

Since Kunthea has probably never yet resolved such a conflict, she may need help.

Could you arrange a skype/zoom session?

Le 12 nov. 2020 à 09:49, ajaniak notifications@github.com<mailto:notifications@github.com> a écrit :

Dear @chhomkuntheahttps://github.com/chhomkunthea,

There is a version conflict on your file K0080.xml. It starts with such a pattern <<<<<<< HEAD and says that 2 versions of the same part of the file coexist. Can you check it and keep only the one you want in the file? Note that there are currently 2 conflicts in the file: one in the apparatus and one in the translation. Thanks for your help

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHubhttps://github.com/erc-dharma/tfc-khmer-epigraphy/issues/19, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AAGMAE3CUHJB45OCRPTBQE3SPOOR5ANCNFSM4TS7X3FQ.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/erc-dharma/tfc-khmer-epigraphy/issues/19#issuecomment-725942046, or unsubscribe https://github.com/notifications/unsubscribe-auth/AM4GVN6W5KP7DYKX5S7JI23SPOQAVANCNFSM4TS7X3FQ.

ajaniak commented 3 years ago

Great, thanks @chhomkunthea