Posts

Showing posts from March, 2026

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 .