[Development] Problem with merging a patch

[Lars Knoll]

Hi Daniel,

Gerrit detected a conflict when it tried to merge your patch. The solution to the problem is usually to rebase your patches onto the latest HEAD of the branch you're targeting. Basically:

git fetch
git rebase origin/branch (dev or 5.11, whichever one you're targeting)
(if required resolve any conflicts)
git push HEAD:refs/for/branch

Cheers,
Lars

> On 20 Mar 2018, at 21:07, Daniel Savi <daniel.savi at gaess.ch> wrote:
> 
> Dear developers
> My journey into Qt development came again to a sudden halt. I've commited this patch (Iaa8ec0246aaba004d98c9e8c66609795101519a9) and Lars Knoll gave it green light after comments from him, André Hartman and Edward Welbourne.
> Now, when I hit the "Merge patch Set to Staging"-button, I'm getting this message:
> 
> Code Review - Error
> Your change could not be merged due to a path conflict. Make sure you staged all dependencies of this change. If the change has dependencies which are currently INTEGRATING, try again when the integration finishes. Otherwise please rebase the change locally and upload the rebased commit for review.
> 
> I thought that my local history looks pretty clean. "git log --oneline" gives me this:
> 2702f9d3fe Add image quality handling to QTextImageFormat
> 36385fb2fa Add more formatting to QTextDocumentWriter when writing ODF files
> 96340a6556 Mark QCoreApplication::applicationPid() as const function
> 
> The third patch is from upstream.
> Can anyone give me a hint what I should do to solve this?
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development