This is a page about a local fork (ie a local branch).
For a remote fork, see Git - Upstream Branch (Tracking branch)
To incorporate the new commits into your feature branch, you have two options: