Skip to content

Update from master branch in upstream repository#78

Open
rikled wants to merge 7 commits into
mainfrom
update-from-master
Open

Update from master branch in upstream repository#78
rikled wants to merge 7 commits into
mainfrom
update-from-master

Conversation

@rikled
Copy link
Copy Markdown
Member

@rikled rikled commented May 19, 2026

This pull request updates the main branch with changes from the master branch in the upstream repository.

⚠️ Merge Conflicts Detected

The automatic merge from upstream encountered conflicts in the following files:

  • Common/3dParty/hunspell/wasm/js/code.js
  • Common/js/string_utf8.js
  • DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js
  • DesktopEditor/graphics/pro/js/wasm/js/drawingfile_native.js

Action Required

  • Manually merge the upstream branch to inspect and resolve the conflicts:
    git fetch upstream master
    git checkout update-from-master
    git merge upstream/master
    # Resolve conflicts, then:
    git add .
    git commit
    git push origin update-from-master

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.

4 participants