Error from integrateIntoHistory for the Gerrit review change.

[jason]

Hi All,

I am not able to merge a change due to conflict. While checking  locally/manually there is no conflicts for the same. I am using Rebase if necessary submit type and allow content merge is true.

--> Rebasing also fails.

Any fix or tips ?

Error is logs:-

[2021-03-30 13:02:52,133] [SSH gerrit review --project int-repo --tag zuul --message Gating succeeded (gate pipeline). [trimmed] --label Gatekeeper=1 --submit 2

923871,10 (scvv)] ERROR com.google.gerrit.server.submit.MergeOp : Error from integrateIntoHistory [CONTEXT SUBMISSION_ID="2923871-1617098570863-31d77bff" ]

com.google.gerrit.server.submit.IntegrationException: Cannot rebase 8b870ec39acf5b8e7cd81869bda0d98e46d85535: The change could not be rebased due to a conflict duri

ng merge.

        at com.google.gerrit.server.submit.MergeOp.integrateIntoHistory(MergeOp.java:639)

        at com.google.gerrit.server.submit.MergeOp.lambda$merge$0(MergeOp.java:504)

        at com.google.gerrit.server.update.RetryHelper.lambda$execute$1(RetryHelper.java:238)

        at com.github.rholder.retry.AttemptTimeLimiters$NoAttemptTimeLimit.call(AttemptTimeLimiters.java:78)

        at com.github.rholder.retry.Retryer.call(Retryer.java:160)

        at com.google.gerrit.server.update.RetryHelper.executeWithTimeoutCount(RetryHelper.java:303)

        at com.google.gerrit.server.update.RetryHelper.execute(RetryHelper.java:236)

        at com.google.gerrit.server.submit.MergeOp.merge(MergeOp.java:486)

        at com.google.gerrit.server.restapi.change.Submit.mergeChange(Submit.java:216)

        at com.google.gerrit.server.restapi.change.Submit.apply(Submit.java:195)

        at com.google.gerrit.server.api.changes.RevisionApiImpl.submit(RevisionApiImpl.java:256)

        at com.google.gerrit.server.api.changes.RevisionApiImpl.submit(RevisionApiImpl.java:250)

        at com.google.gerrit.sshd.commands.ReviewCommand.reviewPatchSet(ReviewCommand.java:300)

        at com.google.gerrit.sshd.commands.ReviewCommand.run(ReviewCommand.java:216)

        at com.google.gerrit.sshd.SshCommand$1.run(SshCommand.java:44)

        at com.google.gerrit.sshd.BaseCommand$TaskThunk.run(BaseCommand.java:467)

        at com.google.gerrit.server.logging.LoggingContextAwareRunnable.run(LoggingContextAwareRunnable.java:83)

        at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)

        at java.util.concurrent.FutureTask.run(FutureTask.java:266)

        at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180)

        at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293)

        at com.google.gerrit.server.git.WorkQueue$Task.run(WorkQueue.java:646)

        at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)

        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)

        at java.lang.Thread.run(Thread.java:748)

Caused by: com.google.gerrit.server.update.UpdateException: com.google.gerrit.server.submit.IntegrationException: Cannot rebase 8b870ec39acf5b8e7cd81869bda0d98e46d85535: The change could not be rebased due to a conflict during merge.

        at com.google.gerrit.server.update.ReviewDbBatchUpdate.executeUpdateRepo(ReviewDbBatchUpdate.java:393)

        at com.google.gerrit.server.update.ReviewDbBatchUpdate.execute(ReviewDbBatchUpdate.java:253)

        at com.google.gerrit.server.update.BatchUpdate$Factory.execute(BatchUpdate.java:145)

        at com.google.gerrit.server.submit.MergeOp.integrateIntoHistory(MergeOp.java:608)

        ... 24 more

Caused by: com.google.gerrit.server.submit.IntegrationException: Cannot rebase 8b870ec39acf5b8e7cd81869bda0d98e46d85535: The change could not be rebased due to a conflict during merge.

[Sven Selberg]

On Thursday, April 1, 2021 at 1:13:04 PM UTC+2 jason wrote:

Hi All,

I am not able to merge a change due to conflict. While checking  locally/manually there is no conflicts for the same. I am using Rebase if necessary submit type and allow content merge is true.

--> Rebasing also fails.

Any fix or tips ?

It would help if you specified which Gerrit version you are using.
From the stacktrace it looks like a rather old version.

[jason]

Hi Sven,

Thanks for the response. Currently I am using 2.16.22  version of Gerrit.

[jason]

Hi Sven,

Is this due to a version bug ?

[Layona Kunjumon]

Hi,

On Monday, April 12, 2021 at 4:33:20 PM UTC+5:30 jason wrote:

Hi Sven,

Is this due to a version bug ?

Could you please update?   We do have still similar errors.

2022-05-23 14:58:23,178] [SSH gerrit review --project PROJECTNAME --tag zuul --message Gating succeeded (gate pipeline). [trimmed] --label Gatekeeper=1 --submit 4273444,3 (USER)] ERROR com.google.gerrit.server.submit.MergeOp : Error from integrateIntoHistory [CONTEXT SUBMISSION_ID="4273459-1653307101723-b236b3ab" ]
com.google.gerrit.server.submit.IntegrationException: Cannot rebase b85c9786d5e866da03833ff3aa6fb32a7a32c775: The change could not be rebased due to a conflict during merge.

Regards,
Layona

[Sven Selberg]

On Monday, May 23, 2022 at 5:50:31 PM UTC+2 layonal...@gmail.com wrote:

Hi,

On Monday, April 12, 2021 at 4:33:20 PM UTC+5:30 jason wrote:

Hi Sven,

Is this due to a version bug ?

Could you please update?   We do have still similar errors.

You are not guaranteed that a rebase will always succed, it may fail due to conflict as it says in the error message. Furthermore there are some cases where JGit cannot handle merge/rebase but c-git can, this may be one of those.
Are we still talking about the same Gerrit instance with the same Gerrit version? If so I would advice you to upgrade.
https://www.gerritcodereview.com/releases-readme.html

/Sven