First time here? Check out the FAQ!
THIS IS A TEST INSTANCE. Feel free to ask and answer questions, but take care to avoid triggering too many notifications.
0

Gerrit code review - What does "cannot merge" mean on the bottom right?

  • retag add tags

On an open code review, what does the cannot merge mean? My lab partner is telling me that the person who put the code review put it in order to find a way to merge his branch. I am talking about this particular review : I197aca5f9b2fb18c26b10325ffe30bc2a8806b78 My partner is telling me that the reviewers are trying to find a way to allow the author to merge his code. However, I find this very illogical since it isn't mentioned anywhere that the person is having trouble merging his code. Can someone please answer so I won't have to argue with him anymore. Thank you.

updated 2018-03-05 00:17:32 +0000
This post is a wiki. Anyone with karma >750 is welcome to improve it.
edit flag offensive 0 remove flag close merge delete

Comments

add a comment see more comments

1 Answer

0

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 Merge label.

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.

Guy Harris's avatar
19.9k
Guy Harris
answered 2018-03-05 00:27:18 +0000
edit flag offensive 0 remove flag delete link

Comments

add a comment see more comments

Your Answer

Please start posting anonymously - your entry will be published after you log in or create a new account. This space is reserved only for answers. If you would like to engage in a discussion, please instead post a comment under the question or an answer that you would like to discuss.

Add Answer