Unicode mapping for CYRILLIC LETTER I WITH GRAVE, RUBLE, BG#2621
Unicode mapping for CYRILLIC LETTER I WITH GRAVE, RUBLE, BG#2621FeralChild64 merged 5 commits intodosbox-staging:mainfrom Torinde:main
Conversation
adding CYRILLIC LETTER I WITH GRAVE adding RUBLE SIGN adding as placeholder Bulgarian romanization mentioning "printable 7-bit ASCII" on the top instead of "7-bit ASCII"
DECOMPOSITION.TXT adding CYRILLIC LETTER I WITH GRAVE, SHORT I
FeralChild64
left a comment
There was a problem hiding this comment.
I have just one remark - please make these changes in one commit:
- Backup your changed files somewhere, just to be sure.
- Execute the following commands in your repository:
git reset HEAD~4
git add .
git commit
git push --forceOne advice for the future: it is best to keep the main branch of your repository a mirror of the original main and only do your development in branches.
Yeah, that's probably vim or vi by default. Type
Get the exact error message for that. I believe Git for Windows has a special GitHub credential manager that should just work when you type your GitHub username and password into it. On other operating systems, (like what I had to do on Linux) you have to make a "Personal Access Token" and use that as your git password: https://github.com/settings/tokens I believe that's not needed on Windows but maybe worth a try if you want to bypass the credential manager. If you want to hop on Discord I might be able to help you further. |
There was a problem hiding this comment.
@Torinde, cheers - very nice PR, 🍻!
@FeralChild64, if you want to try, GitHub has a handy squash-at-merge time. Use the pulldown button beside the Merge:
It will let you edit the single squashed commit:
-
Author will be Torinde.
-
Title will be the PR:
Unicode mapping for CYRILLIC LETTER I WITH GRAVE, RUBLE, BG -
Body is aggregated from all commits:
DECOMPOSITION.TXT adding CYRILLIC LETTER I WITH GRAVE, CYRILLIC LETTER SHORT I ASCII.TXT - adding CYRILLIC LETTER I WITH GRAVE, RUBLE adding CYRILLIC LETTER I WITH GRAVE adding RUBLE SIGN adding as placeholder Bulgarian romanization mentioning "printable 7-bit ASCII" on the top instead of "7-bit ASCII" CAPITAL_SMALL.TXT adding CYRILLIC LETTER I WITH GRAVE MAIN.TXT - adding CYRILLIC LETTER I WITH GRAVE, RUBLE
FeralChild64
left a comment
There was a problem hiding this comment.
OK, let's try squash-merge.
|
@weirddan455 it seems the git-credential-manager.exe is being run by git.exe without any parameter. The text that flashes quickly seems quite similar to what I get when running it manually: Maybe I need to first "store" and/or "configure" the credentials manager... For now, FeralChild64 managed it on his side, so that's OK. |


Closes #2592