From 650427eb940f22699648da28b05ff89dd443e4cf Mon Sep 17 00:00:00 2001
From: Pablo <48098178+PabloRuizCuevas@users.noreply.github.com>
Date: Wed, 21 Sep 2022 10:55:54 +0200
Subject: [PATCH 1/4] Corrected pd.merge indicator type hint

https://pandas.pydata.org/docs/reference/api/pandas.merge.html
It should be "str | bool" instead of just string
---
 pandas/core/frame.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/core/frame.py b/pandas/core/frame.py
index 5468406b2ea21..0ec4caaabb6b5 100644
--- a/pandas/core/frame.py
+++ b/pandas/core/frame.py
@@ -10100,7 +10100,7 @@ def merge(
         sort: bool = False,
         suffixes: Suffixes = ("_x", "_y"),
         copy: bool = True,
-        indicator: bool = False,
+        indicator: str | bool = False,
         validate: str | None = None,
     ) -> DataFrame:
         from pandas.core.reshape.merge import merge

From 90f8319d9ae71fb22d14c539f71c8ac5b91a5af5 Mon Sep 17 00:00:00 2001
From: Pablo <48098178+PabloRuizCuevas@users.noreply.github.com>
Date: Wed, 21 Sep 2022 12:07:22 +0200
Subject: [PATCH 2/4] Update merge.py

fixed type hint in merge.py
---
 pandas/core/reshape/merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py
index 7ec91b23c54f2..a26ad611a7d3d 100644
--- a/pandas/core/reshape/merge.py
+++ b/pandas/core/reshape/merge.py
@@ -107,7 +107,7 @@ def merge(
     sort: bool = False,
     suffixes: Suffixes = ("_x", "_y"),
     copy: bool = True,
-    indicator: bool = False,
+    indicator: str | bool = False,
     validate: str | None = None,
 ) -> DataFrame:
     op = _MergeOperation(

From 2d6c67801a7ffe4b88dedf00722d9f43a2aae2e9 Mon Sep 17 00:00:00 2001
From: Pablo <48098178+PabloRuizCuevas@users.noreply.github.com>
Date: Wed, 21 Sep 2022 13:26:11 +0200
Subject: [PATCH 3/4] Update merge.py

Update indicator type hint in _MergeOperation
---
 pandas/core/reshape/merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py
index a26ad611a7d3d..857a36f26cb11 100644
--- a/pandas/core/reshape/merge.py
+++ b/pandas/core/reshape/merge.py
@@ -625,7 +625,7 @@ class _MergeOperation:
     sort: bool
     suffixes: Suffixes
     copy: bool
-    indicator: bool
+    indicator: str | bool
     validate: str | None
     join_names: list[Hashable]
     right_join_keys: list[AnyArrayLike]

From f3e5a25eb6bff0b368f9990d6f7c5179786bc643 Mon Sep 17 00:00:00 2001
From: Pablo <48098178+PabloRuizCuevas@users.noreply.github.com>
Date: Wed, 21 Sep 2022 14:17:13 +0200
Subject: [PATCH 4/4] Update merge.py

Added type hint _MergeOperation init
---
 pandas/core/reshape/merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py
index 857a36f26cb11..a84f8af7d4c38 100644
--- a/pandas/core/reshape/merge.py
+++ b/pandas/core/reshape/merge.py
@@ -644,7 +644,7 @@ def __init__(
         right_index: bool = False,
         sort: bool = True,
         suffixes: Suffixes = ("_x", "_y"),
-        indicator: bool = False,
+        indicator: str | bool = False,
         validate: str | None = None,
     ) -> None:
         _left = _validate_operand(left)