18.09.2012, 14:51, "Thiago Macieira" <[email protected]>: > To all developers and maintainers who have code in qtbase: > > It appears that the merge resolution of the second commit in qtbase (which is > not represented in the repository, only the results are) introduced a few > regressions. So all developers working in qtbase, please take a moment to look > at the changes introduced to this commit and verify whether the changes are > intentional and should be there.
Simpler solution is to disable "Automatically resolve conflicts" checkbox in Gerrit settings. It would prohibit merge of patches which require non-trivial merge. Bad thing is that you would need to rebase your patches more often. Newer Gerrit versions (2.4 and higher) have server-side rebase feature - you press "Rebase" button in UI and get rebase as new patch set revision, which could be reviewed. -- Regards, Konstantin _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
