If you've forked the Lavender theme, just add the original source as another remote:
$ git remote add upstream git://github.com/NodeBB/nodebb-theme-lavender.git
Then every time you want to merge the latest changes in:
$ git fetch upstream && git merge upstream/master