When you install Regolith, you replace the origin remote with your own repository, so you can't just git pull to merge in updates to Regolith. It's still fairly easy, though; here's how:
git cloneReglith into a separate folder from your existing installtion.- Open your preferred visual diff tool (e.g, DeltaWalker, Meld, Xcode's FileMerge, etc), and compare the two folders.
- Go through each file that has differences, and merge the changes from Regolith to your installation.
- In most cases, this will be pretty simple, but if you've made any customizations to those lines, then you'll need to decide how to resolve the differences.
- When you've finished copying the changes, test that everything still works as expected.
git add -p .to review and stage the changes.git ci -m 'Merge latest Regolith.'git pushbin/deploy.sh