From 50a087de9048e066b085dab1eed8b5ce5bd84073 Mon Sep 17 00:00:00 2001
From: Kipras Melnikovas <kipras@kipras.org>
Date: Thu, 31 Mar 2022 01:36:17 +0300
Subject: [PATCH] use --force-if-inclues alongside --force-with-lease

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
---
 forcePush.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forcePush.ts b/forcePush.ts
index c35ecf1d..c8d6b0e1 100644
--- a/forcePush.ts
+++ b/forcePush.ts
@@ -58,8 +58,13 @@ export const forcePush: BranchSequencerBase = (argsBase) =>
 			 *
 			 * needs to be further explored with our `--sync` (TBD)
 			 *
+			 *
+			 * on --force-if-includes, see:
+			 * - `man git-push`
+			 * - https://stackoverflow.com/a/65839129/9285308
+			 * - https://github.com/gitextensions/gitextensions/issues/8753#issuecomment-763390579
 			 */
-			const forceWithLeaseOrForce: string = "--force-with-lease";
+			const forceWithLeaseOrForce: string = "--force-with-lease --force-if-includes";
 
 			if (!upstreamBranch) {
 				const remotes: string[] = await repo.getRemoteNames();