Migration to main branch
In recent, much of nii-nvim's commit history has been littered with bad practice, greatly
effecting tracking changes. So a hard rebase was done to the branch, which now lives on
main branch. If you do attempt to pull changes, you will get odd issues.
Migrating personal tweaks
nii-nvim is designed to be a base configuration, thus many have modified its core. There are many ways to migrate based on the state of the repo's $working_directory:
The easiest way to transfer all of your changes is to stash your local changes.
Next pull and pop stashed changes
If you have committed changes, you will have to be a bit more involved with picking out commits.
First of all, do not merge upstream changes if you have recent commits on HEAD, rather, you will
want to create patches of your latest commits, then apply them to
main. Generally speaking,
if you dont know if you've committed recently, check
For this example, I have 3 commits applied to master.
I will first generate a diff of my changes and save it to a patch file. You can also make multiple patch files if you have mixed in commits. Make sure to move this patch file OUTSIDE your working directory, so that checkout wont take it.
Next, checkout to the main branch. (make sure to pull it)
Finally, apply the patch of your changes.
Then commit changes
Pull all changes
Remove the master branch