WIP: Delta-sync desyncs
- cover more cases of (potential) desyncs
- get the scenarios into other relevant deltasync tests
- develop a fix
Step 1. Fetch and check out the branch for this merge request
git fetch "https://git.openldap.org/ondra/openldap.git" "delta-conflicts" git checkout -b "ondra/openldap-delta-conflicts" FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "master" git merge --no-ff "ondra/openldap-delta-conflicts"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.