 | 1 | initial version |
To quote the Gerrit documentation:
Submitting a change may fail with conflicts. In this case you need to rebase the change locally, resolve the conflicts and upload the commit with the conflict resolution as new patch set.
If a change cannot be merged due to path conflicts this is highlighted on the change screen by a bold red
Cannot Mergelabel.
There have probably been changes made to the Wireshark code since the last patch set was submitted; the last patch set for that change was submitted a year and a half ago. Mr. Jalali needs to rebase against the current Wireshark master branch, fix any conflicts (for example, if some of the code he changed was also changed in the Wireshark repository in ways that cause his change not to match), and re-submit the result.
Copyright Wireshark Foundation, 2017-2023 Content on this site is licensed under a Creative Commons Attribution Share Alike 3.0 license.
