Kyle Mitofsky KyleMit

Rebasing a branch of a branch after squash merging

Here's a question I asked on slack recently:

When we do a branch off a branch,
and then squash commit the original,
is there a way to get the original commits to not show up on the new PR?

It's a a scenario that comes up not infrequently...

Install Github CLI and login via gh auth login

	using System.Text;
	using BenchmarkDotNet.Attributes;
	using BenchmarkDotNet.Columns;
	using BenchmarkDotNet.Running;

	public class Program
	{
	public static void Main(string[] args)
	=> BenchmarkRunner.Run<StringBuilderSuite>();
	}

	// Update in Method
	public static async Task<Person> GetPersonAsync()
	{
	var model = new Person();

	await Task.WhenAll(
	UpdateFirstName(model),
	UpdateLastName(model),
	UpdateAge(model)
	);

	main()

	function main() {
	var prizes = [-1, -1, -1, 1, 1, 2, 2, 2, 3, 3, 5, 5, 5, 5, 5, 20, 20, 20, 20, 20, 20, 40, 40, 40, 60, 100];
	var simulationResults = Array.from({ length: prizes.length }, (_, i) => simulateTurns(prizes, i + 1));
	console.log(simulationResults);
	}

	function simulateTurns(prizes, selectionCount = 15, turns = 10000) {
	let winningsForAllTurns = Array.from({ length: turns }, () => simulateGame(prizes, selectionCount));

	using System;
	using System.Linq;
	using System.Text.RegularExpressions;
	using BenchmarkDotNet.Attributes;
	using BenchmarkDotNet.Jobs;
	using BenchmarkDotNet.Running;


	BenchmarkRunner.Run<TestAlphaCheck>();

	<!DOCTYPE html>
	<html lang="en">

	<head>
	<meta charset="UTF-8">
	<meta name="viewport" content="width=device-width, initial-scale=1.0">
	<title>Loading Spinner Example</title>

	<link rel="stylesheet" href="./style.css">

	<html>

	<head>
	<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">
	<title>Walkers</title>
	</head>

	<body>

	<header>

	let pets = [
	{ name: "Ranger", type: "Dog" },
	{ name: "Gill", type: "Cat" },
	{ name: "Frida", type: "Cat" }
	]

	let startWithGIndex = pets.findIndex(el => el.name.startsWith("G"))

	console.log(nameStartWithGIndex) // 1

	let checkValInList = (val, ignoreCase, ...list) => {
	return ignoreCase
	? list.some(el => el.toLowerCase() === val.toLowerCase())
	: list.includes(val)
	}

	checkValInList("hello", true, "Hi", "Hello", "Howdy") // true
	checkValInList("hello", false, "Hi", "Hello", "Howdy") // false