update
This commit is contained in:
parent
ab49f55b24
commit
32ecf02994
7
justfile
7
justfile
|
@ -1,3 +1,10 @@
|
||||||
cleanup:
|
cleanup:
|
||||||
rm -rf ~/.local/state/nvim
|
rm -rf ~/.local/state/nvim
|
||||||
rm -rf ~/.local/share/nvim
|
rm -rf ~/.local/share/nvim
|
||||||
|
|
||||||
|
merge:
|
||||||
|
# git remote add upstream git@github.com:nvim-lua/kickstart.nvim.git
|
||||||
|
git checkout master
|
||||||
|
git fetch upstream
|
||||||
|
git merge upstream/master
|
||||||
|
# is there a conflict?
|
||||||
|
|
Loading…
Reference in New Issue