andresgutgon

Why merge in git instead of rebase?

🤖:[ChatGPT4] When managing a shared codebase in a version control system like Git, developers use different methods to integrate changes from one branch into another. Two of the key strategies for integrating changes are merging and rebasing. We'll explore the strengths and reasons for choosing merge over rebase, while keeping in mind your guidance to analyze the issue step by step and from first principles.

Let's first recognize the fundamental aims of both methods:

• Merge: Incorporate the commits from one branch (feature branch) into another branch (mainline) by creating a new merge commit. This merge commit has two parent commits—one from each branch—and ties together the histories of both branches.

• Rebase: Transfer the commits from one branch on top of the commits in another branch, effectively re-writing the project history by creating copies of the original commits.

andresgutgon

<?php

namespace App\Console\Commands;

use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;

class ListDbSchema extends Command
{

andresgutgon

// db/schema/auth.ts
import {
  int,
  timestamp,
  mysqlTable,
  primaryKey,
  varchar,
  text
} from "drizzle-orm/mysql-core"
import type { AdapterAccount } from "@auth/core/adapters"

andresgutgon

import { compact } from './utilities'
import { AnyObject, HttpMethod, ApiDataConfig, ApiError, ApiErrorBody } from './types'

type ContentTypeHeader = 'json' | 'urlencoded'
type AllowedHeaders = {
  contentType?: ContentTypeHeader
}
type BaseConfig = { params?: AnyObject; headers?: AllowedHeaders }
type VerbArgs<T extends HttpMethod> = T extends 'GET'
  ? BaseConfig : T extends 'DELETE' ? BaseConfig

andresgutgon

// Running 
AWS_PROFILE=<MY_USERNAME_PROFILE> pnpm sst dev

// I get this error
 Errors
   Site UPDATE_FAILED
   stack: User: arn:aws:sts::<AWS_ACOUNT_ID>:assumed-role/AWSReservedSSO_sst-stack_<SOME_HASH>/<MY_USERNAME_PROFILE>
   is not authorized to perform: cloudformation:DescribeStacks 
   on resource: arn:aws:cloudformation:us-east-1:<AWS_ACOUNT_ID>:stack/<MY_USERNAME_PROFILE>-local-app-Site/* 
   because no identity-based policy allows the cloudformation:DescribeStacks action

andresgutgon

import type { TransformCallback } from "stream"
import { Transform } from "stream"

export class Meter extends Transform {
  public bytes: number

  constructor(
    public field: string,
    public maxBytes: number
  ) {

andresgutgon

// Documentation:
// https://remix.run/docs/en/v1/api/remix#unstable_createfileuploadhandler
const uploadHandler = unstable_createFileUploadHandler({
  maxFileSize: 5_000_000,
  file: ({ filename }) => filename
})

const fakeDb = createFakeDb()
export const action: ActionFunction = async ({ request }) => {
  const formData = await unstable_parseMultipartFormData(

andresgutgon

# Docker Inspect Volume
# ::::::::::::::::::::::::
# Found here
# https://www.freshblurbs.com/blog/2017/04/16/inspect-docker-volumes-on-mac.html
docker_inspect_volume () {
  DOCKER_VOLUME_OUTPUT=$(docker volume inspect $1);
  DOCKER_VOLUME_OUTPUT=$(echo "$DOCKER_VOLUME_OUTPUT" | grep -E '"Mountpoint": "[^,]*')
  DOCKER_VOLUME_DIR=$(echo "$DOCKER_VOLUME_OUTPUT" | sed -r 's/("Mountpoint"\: ")(.*)(",)/\/docker\2/')
  docker run --rm -it -w $DOCKER_VOLUME_DIR -v /:/docker alpine:edge
}

andresgutgon

import { MeasuringSystem, MeasuringUnit, MeasuringUnitKind } from "db"

const COMMON = { unitless: { count: MeasuringUnit.count } }

type UnitGroup = Record<MeasuringUnitKind, Record<string, MeasuringUnit>>
type SystemUnits = Record<MeasuringSystem, UnitGroup>

export const units: SystemUnits = {
  [MeasuringSystem.METRIC]: {
    ...COMMON,

andresgutgon

import { Suspense, ReactNode } from 'react'
import { Routes, RedirectError, useSession } from "blitz"
import cn from "classnames"

import Layout from "app/core/layouts/Layout"
import type { LayoutProps } from "app/core/layouts/Layout"

const SUPERADMIN_ROLE = 'SUPERADMIN' as never

type CheckIsAdminProps = { children: ReactNode }