Fixed merged conflicts of 2973th pull request#5003
Open
keyboardNinjaWarrior wants to merge 11 commits intotermux:masterfrom
Open
Fixed merged conflicts of 2973th pull request#5003keyboardNinjaWarrior wants to merge 11 commits intotermux:masterfrom
keyboardNinjaWarrior wants to merge 11 commits intotermux:masterfrom
Conversation
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v6...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
twaik
reviewed
Mar 9, 2026
Comment on lines
85
to
131
| fi | ||
|
|
||
| - name: Attach universal APK file | ||
| uses: actions/upload-artifact@v6 | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| name: ${{ env.APK_BASENAME_PREFIX }}_universal | ||
| path: | | ||
| ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_universal.apk | ||
| ${{ env.APK_DIR_PATH }}/output-metadata.json | ||
|
|
||
| - name: Attach arm64-v8a APK file | ||
| uses: actions/upload-artifact@v6 | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| name: ${{ env.APK_BASENAME_PREFIX }}_arm64-v8a | ||
| path: | | ||
| ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_arm64-v8a.apk | ||
| ${{ env.APK_DIR_PATH }}/output-metadata.json | ||
|
|
||
| - name: Attach armeabi-v7a APK file | ||
| uses: actions/upload-artifact@v6 | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| name: ${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a | ||
| path: | | ||
| ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a.apk | ||
| ${{ env.APK_DIR_PATH }}/output-metadata.json | ||
|
|
||
| - name: Attach x86_64 APK file | ||
| uses: actions/upload-artifact@v6 | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| name: ${{ env.APK_BASENAME_PREFIX }}_x86_64 | ||
| path: | | ||
| ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_x86_64.apk | ||
| ${{ env.APK_DIR_PATH }}/output-metadata.json | ||
|
|
||
| - name: Attach x86 APK file | ||
| uses: actions/upload-artifact@v6 | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| name: ${{ env.APK_BASENAME_PREFIX }}_x86 | ||
| path: | | ||
| ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_x86.apk | ||
| ${{ env.APK_DIR_PATH }}/output-metadata.json | ||
|
|
||
| - name: Attach sha256sums file | ||
| uses: actions/upload-artifact@v6 | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| name: ${{ env.APK_BASENAME_PREFIX }}_sha256sums | ||
| path: | |
Member
There was a problem hiding this comment.
Must be removed from the PR, not related to the change.
Member
|
Removing debug_build.yml is not acceptable. Dependabot change is out of scope of PR, you should rebase your changes against master branch. |
Member
|
Merge commits are not acceptable as well, even though it is not filed this way. You should use git rebasing feature, which effectively means history rewrite. |
keyboardNinjaWarrior
force-pushed
the
sixel
branch
from
6de8723 to
d3c8368
Compare
Member
|
You still have the "rebased pull requeat" commit. |
Author
|
I am confused. What do you want me to do? Remove that commit? |
Member
|
I think that what is meant is, that the commits should all be re-typed and re-committed so that these 2 commits disappear: 
|
keyboardNinjaWarrior
force-pushed
the
sixel
branch
from
d3c8368 to
cbb7958
Compare
Author
I have squashed the commits together. Let's see, if there is anything wrong, I'll try my best to fix it. |
Member
|
Ok, now try to remove these 2 commits next: 
|
Add missing {} that change the logic.
- For iterm2 images - catch the error, and cancel the image. - For sixels - if it happens when resizing the bitmap, than ignore drawing outside of the current image.
- Move working bitmap code (drawing current bitmap) to WorkingTerminalBitmap class. - Move bitmap handling code to TerminalBitmap class.
To avoid removing elements from the map while iterating over it. This should solve the Concurrent Modification Exception in the bitmap garbage collection.
Avoid crash when BitmapFactory cannot decode image
…last column. This creates a zero length text run, so skip it.
keyboardNinjaWarrior
force-pushed
the
sixel
branch
from
cbb7958 to
3b90f3c
Compare
Author
|
This bot's commit message is strange. I am unable to view it in my local repository. 
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merged Pull Request: Add graphics in terminal support: - Sixel and iTerm2 protocols #2973 into the main branch and did my best to resolve the conflicts.