diff --git a/ci/code_checks.sh b/ci/code_checks.sh index f022e0176a987..b57426dbb2078 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -191,7 +191,6 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then -i "pandas.errors.IntCastingNaNError SA01" \ -i "pandas.errors.InvalidIndexError SA01" \ -i "pandas.errors.InvalidVersion SA01" \ - -i "pandas.errors.MergeError SA01" \ -i "pandas.errors.NullFrequencyError SA01" \ -i "pandas.errors.NumExprClobberingError SA01" \ -i "pandas.errors.NumbaUtilError SA01" \ diff --git a/pandas/errors/__init__.py b/pandas/errors/__init__.py index 2f625090e0492..7851bc90c5782 100644 --- a/pandas/errors/__init__.py +++ b/pandas/errors/__init__.py @@ -261,6 +261,11 @@ class MergeError(ValueError): Subclass of ``ValueError``. + See Also + -------- + DataFrame.join : For joining DataFrames on their indexes. + merge : For merging two DataFrames on a common set of keys. + Examples -------- >>> left = pd.DataFrame(