Pierstoval

Issue when rebasing lots of branches with conflicts

Working context

Let's imagine I have this git graph:

(fig 1)

* 9e5d9b3 - (HEAD -> branch10) Commit 10
* 3e0a94e - (branch9) Commit 9

Pierstoval

#!/bin/bash
# Pre-requisites: sudo, curl
#
# This script is meant to be run on a fresh Debian 12 (Bookworm) installation
# It will install the latest PHP version, MariaDB, Node.js, NVM, and Caddy
# It also sets up some basic configurations and installs the Symfony CLI
# Usage: Run this script as root or with sudo privileges

# Note:
# You can run the script by just copy-pasting this command:

Pierstoval

activism	attitude of changing things
activists	people that want to change things
advocacy	backing
advocate	backer
advocates	backs
barrier	blocker
barriers	blockers
biased	partisan
biased toward	partisan toward
biases	incorrect views

Pierstoval

<?php

namespace App\DataFixtures\Tools;

use Doctrine\Common\Collections\ArrayCollection;

trait GetObjectsFromData
{
    abstract public static function getStaticData(): iterable;

Pierstoval

<?php

class RawObjectMapper
{
    public static function mapObjects(string $targetClassName, object $sourceObject): object
    {
        $sourceClass = \get_class($sourceObject);
        $targetObject = (new \Doctrine\Instantiator\Instantiator())->instantiate($targetClassName);

        $setter = \Closure::bind(static function (string $property, $value) use ($targetObject, $targetClassName): void {

Pierstoval

curl --silent "https://symfony.com/doc/current/index.html?$(Get-Random -minimum 0)" | htmlq '.thanks strong:first-child' --text | sed -E 's/  +//g' | php -r "echo trim(file_get_contents('php://stdin'));"

Pierstoval

import {spawn} from "child_process";

const yarn_path = process.env.npm_execpath;
const node_path = process.env.npm_node_execpath;

const create_process = function(name, args) {
    let child = spawn(node_path, [yarn_path, ...args], {stdio: 'inherit'});

    child.on('close', (code) => console.log(`child process ${name} exited with code ${code}`));

Pierstoval

_TITLE := "\033[32m[%s]\033[0m %s\n"
_ERROR := "\033[31m[%s]\033[0m %s\n"

obliterate:
	@printf $(_ERROR) "WARNING" "This will remove EVERYTHING and result into a setup similar to a fresh \"git clone\"."

	@printf $(_TITLE) "Project" "Stopping & deleting all containers, volumes, etc."
	@docker-compose down --volumes --remove-orphans --rmi all

Pierstoval

Pierstoval

#
# When you run "make full-reset", you see a warning message telling you to
# re-run the command with an environment variable if you're sure.
#
# So to *actually* execute the command, you have to run "make -e RESET=1 full-reset".
# Feel free to change the "resetting" scripts as you want.
# 

# These are helper vars to use to have a nicer display for messages
_TITLE := "\033[32m[%s]\033[0m %s\n" # Green text