Closed lmignon closed 9 months ago
/ocabot merge patch
This PR looks fantastic, let's merge it! Prepared branch 16.0-ocabot-merge-pr-179-by-lmignon-bump-patch, awaiting test results.
@lmignon The merge process could not start, because command `git merge --no-ff -m 'Merge PR #179 into 16.0
Signed-off-by lmignon' tmp-pr-179` failed with output:
Auto-merging connector_search_engine/static/description/index.html
CONFLICT (content): Merge conflict in connector_search_engine/static/description/index.html
Auto-merging connector_search_engine/models/se_binding.py
Auto-merging connector_search_engine/README.rst
CONFLICT (content): Merge conflict in connector_search_engine/README.rst
Automatic merge failed; fix conflicts and then commit the result.
@lmignon The merge process could not be finalized, because command `git merge --no-ff -m 'Merge PR #179 into 16.0
Signed-off-by lmignon' tmp-pr-179` failed with output:
Auto-merging connector_search_engine/static/description/index.html
CONFLICT (content): Merge conflict in connector_search_engine/static/description/index.html
Auto-merging connector_search_engine/models/se_binding.py
Auto-merging connector_search_engine/README.rst
CONFLICT (content): Merge conflict in connector_search_engine/README.rst
Automatic merge failed; fix conflicts and then commit the result.
cc @sebastienbeau @sbejaoui @qgroulard