Git Archives - Dave Tang's blog

Hosting your own Git repositories

GitDavoAugust 14, 20250

As you may have already heard, GitHub just got less independent at Microsoft after CEO resignation. What does this mean? Well, I guess nobody knows for certain but it probably will mean that GitHub would degrade as a service. As a business, profit and growth are the main focus of Microsoft, so everything else becomes…

Git stash

GitDavoMarch 31, 20250

TL;DR Use git stash to stash changes. Update from remote using git pull. Apply stash changes to latest changes using git stash pop. If there’s a merge conflict, manually resolve using some text editor like Nvim. Changes from upstream and stash are demarcated with angle brackets. After resolving, add, commit, and push! Clean up stash…