what is the gerrit 3.8.4 merge strategy? ort or recursive?

[Kai Lei]

Hi,

Is there any way I can find out if my gerrit  3.8.4 uses ort or recursive merge strategy?

Can I define it in gerrit.config or jgit.config?

Thanks

BR

Leon

[Matthias Sohn]

JGit hasn't implemented the ort merge strategy yet.

It currently supports the following merge strategies: ours, theirs, simple_two_way_in_core, resolve and recursive

See https://github.com/eclipse-jgit/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeStrategy.java#L55

By default JGit uses the recursive merge strategy.

Gerrit also uses the recursive merge by default, you can change that to resolve by setting core.useRecursiveMerge to false.

See https://gerrit-review.googlesource.com/Documentation/config-gerrit.html#core.useRecursiveMerge

and https://gerrit-review.googlesource.com/Documentation/config-project-config.html#submit.mergeContent

 

Thanks

BR

Leon

--
--
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.
To view this discussion on the web visit https://groups.google.com/d/msgid/repo-discuss/CAM-5CsBJUicfNrgPnz7g_opq%2BkUH5gP_TTGOtizPd%2By7JKa89w%40mail.gmail.com.

[Kai Lei]

Thanks a lot for the information!

On Jun 4, 2024, at 08:06, Matthias Sohn <matthi...@gmail.com> wrote: