I am using SourceTree (with BitBucket) to manage my code. I have forked a repo, and the parent repo has been updated.
How do I use SourceTree to merge the upstream code
First, set up the parent repo:
Now, to update: