GitDesktopEngineering notes from building a desktop Git client for GitHub, GitLab and Bitbucket.https://gitdesktop.app/en-usIs it safe to delete .git/index.lock?https://gitdesktop.app/blog/is-it-safe-to-delete-index-lock/https://gitdesktop.app/blog/is-it-safe-to-delete-index-lock/Git says another process seems to be running. What .git/index.lock is, the one check to run before deleting it, and what a hard kill leaves behind.Wed, 16 Sep 2026 00:00:00 GMTtheBGuygitrecoveryWhat FETCH_HEAD is, and why you shouldn't merge ithttps://gitdesktop.app/blog/dont-merge-fetch-head/https://gitdesktop.app/blog/dont-merge-fetch-head/FETCH_HEAD holds whatever the last fetch brought — any fetch, including your editor's. Merge it by name and the branch can swap between your two commands.Wed, 09 Sep 2026 00:00:00 GMTtheBGuygitmergerecoverygit pull --rebase deleted your commit: the rescue and the reasonhttps://gitdesktop.app/blog/pull-rebase-deleted-your-commit/https://gitdesktop.app/blog/pull-rebase-deleted-your-commit/A force-pushed branch plus git pull --rebase silently drops commits you pushed. The reflog rescue, the fork-point mechanism, and why no flag prevents it.Wed, 02 Sep 2026 00:00:00 GMTtheBGuygitrebaserecoveryForce push without overwriting your teammate's workhttps://gitdesktop.app/blog/force-push-without-overwriting-work/https://gitdesktop.app/blog/force-push-without-overwriting-work/git push --force-with-lease protects you only until something fetches. The gap, demonstrated live, and the flag that closes it: --force-if-includes.Wed, 26 Aug 2026 00:00:00 GMTtheBGuygitforce-pushworkflowWork on two branches at once with git worktreehttps://gitdesktop.app/blog/work-on-two-branches-at-once/https://gitdesktop.app/blog/work-on-two-branches-at-once/git worktree gives a second branch its own folder — one repository, two working trees, no stash dance. The rules that keep it safe, and the cleanup.Wed, 19 Aug 2026 00:00:00 GMTtheBGuygitworktreesworkflowUpdate a Git branch without checking it outhttps://gitdesktop.app/blog/update-a-branch-without-checking-it-out/https://gitdesktop.app/blog/update-a-branch-without-checking-it-out/git fetch origin main:main moves a branch while you stay on another. The refspec that does it, the refusals that protect you, and the diverged case.Wed, 12 Aug 2026 00:00:00 GMTtheBGuygitbranchesworkflowI use AI every day. My Git client still has an off switch.https://gitdesktop.app/blog/the-ai-off-switch/https://gitdesktop.app/blog/the-ai-off-switch/GitDesktop is AI-native. One toggle hides all of it. On agency, trust, and the Git client that's left when the AI is gone.Wed, 05 Aug 2026 00:00:00 GMTtheBGuyaiworkflowWill this merge conflict? Find out without merginghttps://gitdesktop.app/blog/preview-a-merge-before-you-run-it/https://gitdesktop.app/blog/preview-a-merge-before-you-run-it/git merge-tree does the whole merge in memory and names every file that would conflict — without touching your working tree, your index, or your branch.Wed, 29 Jul 2026 00:00:00 GMTtheBGuygitmergeconflictsThe whole loop, one window: why I built this Git clienthttps://gitdesktop.app/blog/the-whole-loop-one-window/https://gitdesktop.app/blog/the-whole-loop-one-window/Pull requests that start before you push, branch updates without switching, and guardrails that aren't a pricing tier — the assumptions behind GitDesktop.Sun, 26 Jul 2026 00:00:00 GMTtheBGuygitworkflowpull-requestsRecovering a dropped stash: what git fsck can still findhttps://gitdesktop.app/blog/recover-a-dropped-git-stash/https://gitdesktop.app/blog/recover-a-dropped-git-stash/A dropped or lost git stash is almost never gone. How to find it with git fsck, tell the real stash commit from its index twin, and get the work back.Sat, 25 Jul 2026 00:00:00 GMTtheBGuygitrecoverystash