Use an app called SourceTree. It helps a lot with pushing/pulling from git and offers a variety of tools. First link on Google.
Also, to your post, just look up on Google:
1.Configure the 'fetch' to fetch the branch you originally pulled from.
2.Fetch the remote branch.
3.Merge that remote branch onto your local branch.
4.Commit the (merge) change in your local repo.
5.Push the change to the remote repo.