How do you recommend I keep up to date?
Forgive me if this isn't the appropriate venue for a question like this, but I'm migrating a large community to vanilla and as a developer, I'm trying to follow best practices for version control.
I currently have Vanilla 2.1.3 installed via git clone from a few months ago. After installing, I added a theme and a few plugins and activated them. I now want to upgrade to 2.1.6, so I thought I'd do a git pull origin Vanilla_2.1.6 but because those plugins made local changes to code, it doesn't want to merge.
Should I stash those changes, pull in the new version, and then attempt to apply the changes? Or is there a better workflow to keep up to date?
As a similar question, if I want to do other things like edit the links in the nav bar at the top (which I believe would require a code change), how do you recommend I do that without preventing my ability to update?
Thanks for your help.