Merge conflict - Not current, rebase possible

[d.san...@stuart.com]

Hello,

I have a recurrent issue with our Gerrit.

Merging some commits makes other commits show a merge conflict even when there are no conflicts at all. Gerrit shows the following message: Not current, rebase possible.

This issue can be fixed by just rebasing the commit (manually or using the built in rebase button) but I don't understand why is Gerrit complaining in the first place. There's no conflicting files, just the parent has been changed. Can someone point me in the right direction for this? Is this behaviour correct or can I change something in the Gerrit config to avoid this? 

Rebasing is not a big deal but this causes all the hooks to run again and forces to review the commit again without any change.

Thanks,

Dani

[Alex Blewitt]

> On 11 May 2016, at 12:06, d.san...@stuart.com wrote:
>
> Hello,
>
> I have a recurrent issue with our Gerrit.
>
> Merging some commits makes other commits show a merge conflict even when there are no conflicts at all. Gerrit shows the following message: Not current, rebase possible.

Do you have the project (or all projects) configured to use ‘fast forward only’? If so, you’ll need to click the ‘rebase’ message on the other changes, and/or rebase and resend the other commits. If not, what is the project’s strategy?

Alex

[Edwin Kempin]

Also check whether content merge is enabled or not:

https://gerrit-review.googlesource.com/Documentation/project-configuration.html#content_merge

 

Alex

--
--
To unsubscribe, email repo-discuss...@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en

---
You received this message because you are subscribed to the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to repo-discuss...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[d.san...@stuart.com]

Project is configured with Merge if necessary

Dani

[d.san...@stuart.com]

You were right, somehow content merge was disabled instead of inheriting true. Changing this config solved the issue.

Thanks a lot!

Dani