RHEL Engineering is moving the tracking of its product development work on RHEL 6 through RHEL 9 to Red Hat Jira (issues.redhat.com). If you're a Red Hat customer, please continue to file support cases via the Red Hat customer portal. If you're not, please head to the "RHEL project" in Red Hat Jira and file new tickets here. Individual Bugzilla bugs in the statuses "NEW", "ASSIGNED", and "POST" are being migrated throughout September 2023. Bugs of Red Hat partners with an assigned Engineering Partner Manager (EPM) are migrated in late September as per pre-agreed dates. Bugs against components "kernel", "kernel-rt", and "kpatch" are only migrated if still in "NEW" or "ASSIGNED". If you cannot log in to RH Jira, please consult article #7032570. That failing, please send an e-mail to the RH Jira admins at rh-issues@redhat.com to troubleshoot your issue as a user management inquiry. The email creates a ServiceNow ticket with Red Hat. Individual Bugzilla bugs that are migrated will be moved to status "CLOSED", resolution "MIGRATED", and set with "MigratedToJIRA" in "Keywords". The link to the successor Jira issue will be found under "Links", have a little "two-footprint" icon next to it, and direct you to the "RHEL project" in Red Hat Jira (issue links are of type "https://issues.redhat.com/browse/RHEL-XXXX", where "X" is a digit). This same link will be available in a blue banner at the top of the page informing you that that bug has been migrated.

Description of problem:

this is just a copy of upstream bug:

https://pagure.io/389-ds-base/issue/49043

because customer wants to be updated once this bug is fixed.

Replication conflicts are created mostly because of failures in manually applying updates on different servers or client applications. But once they are created many clients, applications and users have problems to understand and handle them properly.
In most cases the "original" and "conflict" entries are identical, but there exist scenarios where both entries could have (different) children before the conflict is created, so they cannot be completely hidden or ignored.

There are several proposals to handle this, the latest: http://www.port389.org/docs/389ds/design/managing-repl-conflict-entries.html

which also discusses teh other proposals and open issues with conflict entries.

This ticket should be used to evaluate the suggested solutions and implement one, making the other tickets obsolete.

Close as a dup to Bug 1274430?

*** This bug has been marked as a duplicate of bug 1274430 ***