Skip to content

Commit

Permalink
fix documentation for custom strategies
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-golda authored Mar 29, 2023
1 parent c96610a commit 5c10415
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docs/guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Custom Strategies
Strategies are functions that satisfy the following properties:

* have the function signature (config, path, base, nxt)
* return the merged object, or None.
* return the merged object, or `deepmerge.STRATEGY_END`.

Example:

Expand All @@ -92,7 +92,7 @@ Example:
base.append(nxt[-1])
return base
If a strategy fails, an exception should not be raised. This is to
If a strategy fails, an exception should not be raised, instead it should return `deepmerge.STRATEGY_END`. This is to
ensure it can be chained with other strategies, or the fall-back.

Uniqueness of elements when merging
Expand All @@ -104,4 +104,4 @@ types, this includes structures that are not hashable such as
dictionaries.

In those cases, built-in deepmerge strategies will call repr()
on the object and hash that value instead.
on the object and hash that value instead.

0 comments on commit 5c10415

Please sign in to comment.