It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Having trouble merging a master into my fork, please advise

Warning: Brand new SourceTree user, and inexperienced GitHub user!

I forked someone else's repo on GitHub a few weeks ago, and have made some changes to my fork.

However, since then, commits have been made to the master repo, and I now want to pull those changes to my fork. However, I cant seem to work out how to do this.

I had a look at the docs, but what they show bears little relationship to what I see. Don't know if that's because I'm on Windows and that page mentions MacOS...

1.png

Anyway, I clicked on Working Copy, as that's my fork, which is behind the master,and then clicked the Merge button. This gave me something that looked like in the docs. However, the commit graph (which looked the same as the bit you can see above) only showed commits on the master repo up to the point where I last got a copy of the files. None of the commits since then show up.

I tried clicking the OK button to see if it would pull anything from the master, but nothing happened.

Anyone able to help me? I need to get my fork up to date with the commits that have been made to the master repo since I last got the files.

Thanks

2 answers

1 accepted

0 votes
Answer accepted

Hello,

Thanks for the reply. It turned out that I hadn't added the master repository to SourceTree, so it could only see my fork on GitHub and my local copy. Once I added the master, I was able to grab the latest.

Thanks again

Ana Retamal Atlassian Team Oct 23, 2018

Glad you figured it out! Have a great day :) 

Ana

0 votes
Ana Retamal Atlassian Team Oct 22, 2018

Hi Avrohom, welcome to the Community :)  

In this case you don't need to merge the branches, what you need to do is to pull the changes from the main branch to your fork. Have you tried that already? To do so:

  1. Click on the "Pull" button on the toolbar. A Pull window should appear.
  2. Select the remote to pull from.
  3. Select the remote branch to pull changes from.
  4. Click "OK" to pull changes from your remote repository into your local working directory.

Let us know if this helped you!

Kind regards,

Ana

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,955 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you