use --force-if-inclues alongside --force-with-lease

Signed-off-by: Kipras Melnikovas <[email protected]>
kiprasmel · May 8, 2022 · 50a087d · 50a087d
1 parent f53eba8
commit 50a087d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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();