reshke commented on issue #1566:
URL: https://github.com/apache/cloudberry/issues/1566#issuecomment-3940228829
Trivial resolve for 120e159b7d9:
```
reshke@yezzey-cbdb-bench:~/cloudberry$ git status
On branch address_1566_p4
You are currently cherry-picking commit 120e159b7d9.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: doc/src/sgml/brin.sgml
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: doc/src/sgml/ref/drop_extension.sgml
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: src/test/regress/sql/misc.sql
reshke@yezzey-cbdb-bench:~/cloudberry$ git diff
doc/src/sgml/ref/drop_extension.sgml
diff --cc doc/src/sgml/ref/drop_extension.sgml
index 166c6c3aef2,dcc52c2ced0..00000000000
--- a/doc/src/sgml/ref/drop_extension.sgml
+++ b/doc/src/sgml/ref/drop_extension.sgml
@@@ -80,9 -80,9 +80,15 @@@ DROP EXTENSION [ IF EXISTS ] <replaceab
<term><literal>RESTRICT</literal></term>
<listitem>
<para>
++<<<<<<< HEAD
+ Refuse to drop the extension if any objects depend on it (other than
+ its own member objects and other extensions listed in the same
+ <command>DROP</command> command). This is the default.
++=======
+ This option prevents the specified extensions from being dropped
+ if there exist non-extension-member objects that depend on any
+ of the extensions. This is the default.
++>>>>>>> 120e159b7d9 (Fix assorted doc typos)
</para>
</listitem>
</varlistentry>
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
