On 2026-07-12 22:45, Patrick Luby wrote:
Thanks Dan! I was able to apply, build, and run your Qt for macOS patches against the latest master commit without any problems. :)[...] Hopefully my window sizing and content scaling work isn’t bumping into your work. I’ll work on getting my ugly, experimental macOS patch in https://gerrit.libreoffice.org/c/core/+/207229 into a new Gerrit patch that works with your master patches.
Thanks a lot to both of you for your macOS work and also for outlining (in the other email) the different approaches to scaling currently implemented for the different platforms!
BTW, I didn’t see any of the merge conflicts that Gerrit shows so I assume that is good news. I did a git pull -r on master, downloaded the top of the relation chain patch, and rebased the local relation chain branch created by the download to master without any need to merge or resolve conflicts.
That "Merge Conflict" marker in a Gerrit change can be a bit misleading.It means there would be a merge conflict when applying that particular change by itself on top of current git master, i.e. without applying/merging the underlying changes in the change series first. (It's normal/expected in a change series with changes depending on each other and should disappear once the underlying changes have been merged.)
For example for https://gerrit.libreoffice.org/c/core/+/207980/3 , trying to apply the change by itself using
git review -x 207980
on top of current muster would result in a merge conflict, but doing it
after applying the underlying changes first using
git review -x 207978
git review -x 207979
git review -x 207980
or alternatively checking out the series in a branch and rebasing onto
master (as you did) using
git review -d 207980
git rebase master
should work just fine.
(Same for using the corresponding commands shown in the Gerrit web
interface to apply the changes instead of `git review`.)
OpenPGP_signature.asc
Description: OpenPGP digital signature
