https://bugs.documentfoundation.org/show_bug.cgi?id=156816
--- Comment #6 from Julien Nabet <[email protected]> --- (In reply to prrvchr from comment #5) > I just submitted a new fix: > > https://gerrit.libreoffice.org/c/core/+/155882/1 > > Apparently it is in conflict with my first update which does not pass the > tests. I do not know how to do... In fact, you should have amended (see "amend" keyword for git) the first patch. What you can do now: - abandon the second patch - clean your local repo to be sync with master (something like "git reset --hard origin/master") - cherry-pick the first patch with: git fetch https://git.libreoffice.org/core refs/changes/66/155866/1 && git cherry-pick FETCH_HEAD - make the changes you want locally - use "git --amend" - submit the new version of the patch Concerning the error, it's because you got 2 appends in a row line 155: aSql.append(")"); aSql.append(sTypeName.subView(nParenPos)); You can do instead: aSql.append(")" + OUString::Concat(sTypeName.subView(nParenPos))); -- You are receiving this mail because: You are the assignee for the bug.
