nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Having trouble merging a master into my fork, please advise

Avrohom_Yisroel_Silver

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...

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

Accepted answers

Avrohom_Yisroel_Silver

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

All comments

Ana Retamal

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:

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

Let us know if this helped you!

Kind regards,

Ana

Avrohom_Yisroel_Silver

Hello,

Thanks again

Ana Retamal

Glad you figured it out! Have a great day

Ana

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

git

windows

github