Upgrade Lantern with Git

You might have a fork for your web service, but somehow you want to upgrade Lantern for solving critical bugs and new features. Here is document to describe how to make it.

With Git, it is quite easy to sync latest version with your own project, you only need to setup remote upstream repository.

git remote add upstream git@github.com:cfsghost/lantern.git`

When you want to sync up, just check out your fork's local branch.

git checkout master

Fetch the branches and their respective commits from the upstream repository. Commits to 'master' will be stored in a local branch, upstream/master.

git fetch upstream

Merge the changes from upstream/master into your local master branch. This brings your fork's master branch into sync with the upstream repository, without losing your local changes.

git merge upstream/master