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

#!/bin/bash

# Claude Desktop Multi-Instance Launcher
#
# Uses Electron's --user-data-dir flag to run fully isolated instances.
# Each instance gets its own data directory (config, VM bundles, SDK, sessions).
#
# Usage:
#   ./claude_quick.sh                    # Show interactive menu
#   ./claude_quick.sh <instance>         # Launch named instance