Skip to content

Commit

Permalink
docs: apply suggestions in docs
Browse files Browse the repository at this point in the history
Co-authored-by: Omry Yadan <omry@yadan.net>
  • Loading branch information
MatteoVoges and omry authored Jun 21, 2023
1 parent 485403a commit fe60429
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions docs/source/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -493,9 +493,8 @@ Note how the port changes to 82, and how the users lists are combined.
<BLANKLINE>

By default, ``merge()`` is replacing the target list with the source list.
Use ``list_merge_mode`` to control the merge behavior for lists.
You can access the regarding enum with ``from omegaconf import ListMergeMode``.
Currently there are three different merge modes:
Use ``list_merge_mode`` to control the merge behavior for lists.
This Enum is defined in ``omegaconf.ListMergeMode`` and defines the following modes:
* ``OVERRIDE``: content from newer list gets taken (default)
* ``EXTEND``: lists get extended
* ``EXTEND_IGNORE_DUPLICATES``: only new (unique) elements get extended
Expand Down
2 changes: 1 addition & 1 deletion news/1082.feature
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OmegaConf.merge() can now concat lists instead of replacing the target list
OmegaConf.merge() can now takes a list_merge_mode parameter that controls the strategy for merging lists (replace, extend and more).

0 comments on commit fe60429

Please sign in to comment.