Version conflict on MpuManu.xml

erc-dharma / tfc-nusantara-epigraphy

DHARMA project task force C, Nusantara epigraphic corpus

https://dharma.hypotheses.org/

Creative Commons Attribution 4.0 International

1 stars 0 forks source link

Version conflict on MpuManu.xml #28

Closed ajaniak closed 3 years ago

ajaniak commented 3 years ago

Dear all,

MpuManu.xm has a version conflict. I am not sure whose in charge of this file, can someone handle it and clean the file to restore it to a stable state please? Thanks

arlogriffiths commented 3 years ago

I’ll take care of it a.s.a.p.

Le 3 nov. 2020 à 15:51, ajaniak notifications@github.com<mailto:notifications@github.com> a écrit :

Dear all,

MpuManu.xm has a version conflict. I am not sure whose in charge of this file, can someone handle it and clean the file to restore it to a stable state please? Thanks

— You are receiving this because you were assigned. Reply to this email directly, view it on GitHubhttps://github.com/erc-dharma/tfc-nusantara-epigraphy/issues/28, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AAGMAE4OGBGZGP4MR4EZ57DSOAKIHANCNFSM4TI25AXQ.

arlogriffiths commented 3 years ago

I have resolved the conflicts.

I don't know who/what generated the derivative files _BACKUP, _BASE, _LOCAL, _REMOTE (see screenshot attached).

@ajaniak : can you delete them now?

ajaniak commented 3 years ago

They are from a commit made by @ekobastiawan (2020-10-30). I can delete them of course.

ajaniak commented 3 years ago

I have moved them out the repository. I have kept a back-up version just in case. @ekobastiawan maybe you could also check the file to be sure all your work are still in it, if not let me know and I can fusion the content of the duplicated ones with the main. @arlogriffiths nothing was new when I pulled, can you push it please?

arlogriffiths commented 3 years ago

done. do you have the new file now?

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

I have moved them out the repository. I have kept a back-up version just in case. @ekobastiawanhttps://github.com/ekobastiawan maybe you could also check the file to be sure all your work are still in it, if not let me know and I can fusion the content of the duplicated ones with the main. @arlogriffithshttps://github.com/arlogriffiths nothing was new when I pulled, can you push it please?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/erc-dharma/tfc-nusantara-epigraphy/issues/28#issuecomment-721607890, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AAGMAEYR43JRMHQMNMUL7ITSOEK5RANCNFSM4TI25AXQ.

ajaniak commented 3 years ago

Yes, thanks! the template has been updated for this file as well

arlogriffiths commented 3 years ago

good.

Eko wasn't aware himself of how those derived files ever got created, so I don't think they can contain anything of value. I think we can close this issue now