Posts

Compare Local and Remote Branches with external tools

✅ Use VS Code as diff tool (clean setup) Run this once in your terminal (WSL or normal): git config --global diff.tool vscode git config --global difftool.vscode.cmd "code --wait --diff $LOCAL $REMOTE" git config --global difftool.prompt false ๐Ÿš€ How to use it git difftool origin/UAT...HEAD ๐Ÿ‘‰ Result: Opens each file in side-by-side diff view Clean UI (like VS Code) ๐Ÿง  Tip (very useful) If you want just one file : git difftool origin/UAT -- path/to/file.php ✅ Set up WinMerge as diff tool (Windows) Now let’s wire up WinMerge . ๐Ÿ”ง 1. Install WinMerge Download & install normally (if not already). Make sure path looks like: C:\Program Files\WinMerge\WinMergeU.exe or C:\WinMerge\WinMergeU.exe ๐Ÿ”ง 2. Configure Git Run this in Windows Git Bash (important, not WSL): git config --global diff.tool winmerge git config --global difftool.winmerge.cmd '"/mnt/c/WinMerge/WinMergeU.exe" -e -u -dl Local -dr Remote "...

Logout from Amazon Q VSC

1. Force sign-out from VS Code Accounts In VS Code: Press Ctrl + Shift + P Run: Accounts: Sign Out Select: AWS Builder ID or anything related to Amazon / AWS . Then restart VS Code. 2. Remove authentication sessions manually Inside WSL run: rm -rf ~/.vscode-server/data/User/globalStorage/ms-vscode.authentication and also: rm -rf ~/.vscode-server/data/User/secrets Then restart VS Code. 3. Clear browser AWS login (very important) Amazon Q authentication comes from AWS Builder ID via browser OAuth. Logout here: https://profile.aws.amazon.com/ or open private/incognito window before logging in again. 4. Nuclear reset (guaranteed) Close VS Code completely, then run in WSL: rm -rf ~/.vscode-server Then reopen the project: code . This forces VS Code to reinstall the server and removes all cached auth tokens .

MySQL search value methods

If you want to find a specific value anywhere in a MySQL database (any column, any table), there are a few common approaches—ranging from quick-and-dirty to more systematic. 1️⃣ Search a known table but any column If you know the table but not the column: SELECT * FROM your_table WHERE col1 = 'value' OR col2 = 'value' OR col3 = 'value'; ⚠️ This requires you to list columns manually. 2️⃣ Search all columns of all tables (automatic way) This is the practical solution when you have no idea where the value lives. Step 1: Generate search queries using INFORMATION_SCHEMA SELECT CONCAT( 'SELECT "', TABLE_NAME, '" AS table_name, "', COLUMN_NAME, '" AS column_name FROM ', TABLE_SCHEMA, '.', TABLE_NAME, ' WHERE ', COLUMN_NAME, ' = ''your_value'';' ) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = 'your_database'; This generates SQL statem...

Join vs Model vs Relationship in Laravel

Understanding SQL joins, Eloquent relationships, and model accessors. 1) Join (Database level) A join is a database operation used to combine rows from multiple tables. It happens at the SQL level and is focused on performance and filtering. Example: SELECT users.name, posts.title FROM users JOIN posts ON posts.user_id = users.id; Runs in the database Returns raw rows Very fast 2) Relationship (Eloquent ORM level) A relationship defines how models are connected. It represents business meaning, not just raw data. class User extends Model { public function posts() { return $this->hasMany(Post::class); } } Usage: $user->posts; Returns model objects Supports lazy & eager loading Encodes domain logic 3) Model Accessor (Presentation level) An accessor is a computed attribute on a model. It does not fetch data from the dat...

Check Change Files in Git

You can compare only the files that differ between your current local branch and another branch on the remote using Git. Here are the most common and useful ways, from simplest to more detailed. 1. List only the changed files (most common) git fetch origin git diff --name-only origin/other-branch If you want to be explicit about your current branch: git diff --name-only origin/other-branch..HEAD ➡️ Shows only file paths that are different. 2. List changed files with change type (added / modified / deleted) git diff --name-status origin/other-branch..HEAD Example output: M src/app.js A src/new-file.ts D src/old-file.css 3. Compare against the common ancestor (recommended for PR-style comparison) This avoids noise from changes made in the target branch after you branched. git diff --name-only origin/other-branch...HEAD ... (three dots) means: changes on your branch since it diverged from the other branch This is usually what you want when prepari...

Compare local files with remote Git repo using WinMerge

Here’s a clean step-by-step way to compare your local WSL repo folder vs the remote repo state in WinMerge , and then show only changed files . 1) In WSL: go to your repo and fetch remote cd /path/to/your/repo git fetch origin 2) In WSL: create a “remote snapshot” folder (safe, no checkout) This exports the remote branch into a temp folder. REMOTE_BRANCH=origin/main SNAP=/tmp/repo_remote_snapshot rm -rf " $SNAP " mkdir -p " $SNAP " git archive " $REMOTE_BRANCH " | tar -x -C " $SNAP " Change origin/main if your remote branch is different (e.g. origin/master , origin/develop ). 3) Open WinMerge and start a folder compare Launch WinMerge (on Windows) File → Open… (or “Open”) Select Folder Compare 4) Pick the two folders (WSL paths via \\wsl$ ) In WinMerge: Left (Local working folder) Use your actual repo path in WSL: \\wsl$\Ubuntu\home\<youruser>\ path \ to \your\repo Right (Remote snapshot folder) \\wsl $ \Ubu...

Revert Git to last commit

  If you want to revert everything back to the last commit and discard all local changes , use this ๐Ÿ‘‡ ๐Ÿ”ฅ Hard reset (most common & safest) This restores your working tree and index to the latest commit . git reset --hard HEAD What this does ❌ Discards all modified files ❌ Discards all staged files ❌ Discards all untracked changes in tracked files ✅ Leaves your repo exactly as the last commit ๐Ÿงน Also remove untracked files (optional but often needed) If you also want to delete untracked files and folders : git clean -fd Or preview first (recommended): git clean -fdn ✅ One-liner (full nuclear option) git reset --hard HEAD && git clean -fd ⚠️ Important warning This is irreversible unless: Changes were committed Or stashed Or still exist elsewhere