| Issue 2811: | 'Merge Conflict' status in all review with dependency | |
| 5 people starred this issue and may be notified of changes. | Back to list |
************************************************************ ***** NOTE: THIS BUG TRACKER IS FOR GERRIT CODE REVIEW ***** ***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, INTERNAL ***** ***** ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC. ***** ***** THOSE ISSUE BELONG IN DIFFERENT ISSUE TRACKERS! ***** ************************************************************ Affected Version: 2.9 What steps will reproduce the problem? 1. Upload review 2. Upload another review depends from first 3. Upload third review that depends from second What is the expected output? What do you see instead? That 2 reviews must have clean status, instead second review have "Merge Conflict" status. Please provide any additional information below. After upgrading to gerrit 2.9 we have 'Merge Conflict' status in all review with dependency. After first review in chain submited, in second review 'Merge Conflict' status cleaned. We use 'Rebase if necessary' submit type. Is it normal? How can we revert to 2.8 behavior?
Aug 18, 2014
Project Member
#1
bassem.rabil
Apr 16, 2015
I also see these bogus "merge conflict" messages with version 2.10.2, "Rebase if Necessary" submit type and "Automatically resolve conflicts" enabled. It seems that Gerrit is determining conflicts by trying to apply each change in the series onto the target branch individually, without taking any dependent changes of the same series into account. This is bogus because at submit time there would be no conflicts: If submitting a change that has dependencies, the integration would be pending until all dependent changes are merged. |
|
| ► Sign in to add a comment |