stracker-phil

Resolving Merge Conflicts

The inspect-conflict.sh script compares a single file on two branches to find out which branch introduced a specific code changes. This documentation explains, how the log inside the script evolved and what it does.

Rules

1. Resolve one file at a time
2. First, apply the upstream version
3. Unstage all changes of that file
4. RESOLVE: Review each change one-by-one and either stage or discard

stracker-phil

#!/usr/bin/env bash

# FILE: .git/hooks/post-checkout

# Updates the DDEV environment after switching a branch.

PREV_HEAD="$1"     # Hash of previous HEAD
NEW_HEAD="$2"      # Hash of new HEAD
CHECKOUT_TYPE="$3" # 1 if checking out a branch, 0 if checking out something else, such as a file (rollbacks)

stracker-phil

#!/usr/bin/env python3

import json
import os
from openai import OpenAI

# URL: https://gist.github.com/stracker-phil/d1d874a299883ff540966a402793f616
#
# Usage:
# 1. Download the current translations as JSON format from the internal GlotPress site.

stracker-phil

use framework "Foundation"
use scripting additions

property NSString : a reference to current application's NSString
property NSMutableCharacterSet : a reference to current application's NSMutableCharacterSet

set fileType to ".md"
set prefUrl to ""

try

stracker-phil

<?php
/**
 * How to use this snippet:
 *
 *  1. Click the "Download ZIP" button (top-right area)
 *  2. Open wp-admin > Plugins > Add New
 *  3. Click "Upload Plugin" and select the zip file
 *  4. After uploading the zip file, activate the plugin
 *
 * ----------

stracker-phil

<?php
/**
 * Generate a random discount code that matches the given criteria.
 *
 * Samples:
 *  - generate_discount( 10, 'percent', '+7days', 'HI-^^^^' );
 *  - generate_discount( 5, 'flat', '', '********' );
 *
 * @param int    $amount  The discount code value.
 * @param string $type    The type, either [flat|percent].

stracker-phil

<script>
	setTimeout(function () {
		DiviArea.show('contact');
	}, 5000);
</script>

stracker-phil

<script>
(function () {
	// TODO: Adjust the following two lines:
	
	var popup = 'contact'; // Your Popup ID.
	var delay = 5;         // Delay [in seconds].

	setTimeout(function () {
		DiviArea.show(popup);
	}, delay * 1000);

stracker-phil

<script>
(function ($) {

  // TODO: Adjust the following to lines to your needs:
	
  var popup = 'contact'; // Your Popup ID.
  var distance = 500;    // Scroll distance [pixel].

  $(window).on('scroll.popup_' + popup, function () {
    // Check if the user scrolled far enough.

stracker-phil

<?php
/**
 * How to use this snippet:
 *
 *  1. Click the "Download ZIP" button (top-right area)
 *  2. Open wp-admin > Plugins > Add New
 *  3. Click "Upload Plugin" and select the zip file
 *  4. After uploading the zip file, activate the plugin
 *
 * ----------