Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abb161 correct arabic works #1045

Merged
merged 8 commits into from
Jan 24, 2024
Merged

Abb161 correct arabic works #1045

merged 8 commits into from
Jan 24, 2024

Conversation

DenisNosnitsin1970
Copy link
Contributor

@DenisNosnitsin1970 DenisNosnitsin1970 commented Jan 23, 2024

It looks like this PR went wrong, created another one. BetaMasaheft/Documentation#2463

The new Bm record equivalent to LIT3527IHA.
2077 will remain, 6914 will be cancelled in the next round.
@eu-genia
Copy link
Contributor

6914 was already merged here #1044 and should be now deleted in this PR, not updated

<listWit>
<witness corresp="AMS00004" xml:id="L">Agaro / Aggārō, Agaro Muḥammad Sayf, AMS00004;</witness>
<witness corresp="MAJ00060" xml:id="P">Jimata, Muḥammad Abba Jamaal, MAJ00060</witness>
</listWit>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and also BNFabb161 to complete the list

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@@ -6,7 +6,9 @@ type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<fileDesc>
<titleStmt>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please delete this file and commit the change to this branch and PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is not deleted. you must delete 6914

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

switch to this branch in github desktop
sync so that you do not keep remerging the branches
delete the file
commit
push

@DenisNosnitsin1970
Copy link
Contributor Author

DenisNosnitsin1970 commented Jan 24, 2024

I thoufgt I have deleted it, and it looked so,
73ace35. What if you let PR though, and if 6914 is still there, I will delete it in a separate round? (Before I though it should be the procedure).

@eu-genia
Copy link
Contributor

In this round please, it had already been merged, no need to sync, please delete in this branch

@eu-genia
Copy link
Contributor

It seems that you deleted it but then you got out of sync and remerged the branch
if you look in the github desktop history you will see that you recreated it by remerging
This is why it is very important to always sync by fetch and pull in github desktop before committing any changes

…/BetaMasaheft/Works into Abb161CorrectArabicWorks"

This reverts commit 20c00f9, reversing
changes made to 73ace35.
@eu-genia
Copy link
Contributor

I have now reverted the latest commit which was the restoration of the record to be deleted by the merging of the unsynced branch

Copy link
Contributor

@eu-genia eu-genia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have fixed the issue please always sync your branches to avoid overwriting your own changes by remerging from the unsynced version

@eu-genia eu-genia merged commit f582594 into master Jan 24, 2024
1 check passed
@DenisNosnitsin1970
Copy link
Contributor Author

Thank you! :)

@eu-genia eu-genia deleted the Abb161CorrectArabicWorks branch April 24, 2024 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants