Git stash
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…