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; } } }

View Branches in SourceTree for Subtrees

David Jacobson_3iwxv9

Just created a subtree within a master project.
Project [Project Name]
Subfolder [subtree]

I now see the SUBTREES option in the left control panel of SourceTree which is point to my git repository. I then created a branch in JIRA but it doesn't show up within the main project or the subtree.

Am I missing a step or did I do something incorrectly when I set up the subtree?

Looking for more guidance, examples, instructions, etc., on how to do this process. Hopefully this is what I need to do to do what I want.

Ultimately we are trying to separate smaller projects (subtrees) that are a part of a larger project without having to mess with any other code except for the specific subtree project.

Thanks for any help or guidance you can provide me!!

Accepted answers

All comments

Mikael Sandberg

Hi @David Jacobson,

Welcome to the Atlassian Community.

After you created your branch in Jira, did you do a Fetch in the corresponding repository? When you create a branch in Jira, it will only create it on the remote repository, it will not push it out to local clones (mainly because Git do not keep track of clones).

Note that the subtree in Sourcetree will only allow you to pull in new commits on a specified branch, it will not show all branches in the subtree. The only time you will see all branches is if you right-click on the subtree and select Edit, from here you can change which branch it should pull from/push to.

When I was putting together a Confluence page for my users about Git subtrees I found this blog post,https://medium.com/@v/git-subtrees-a-tutorial-6ff568381844, that explains how subtrees works.

David Jacobson_3iwxv9

Thanks so much Mikael. I am very new to git and my PM has asked me to lead this process and figuring out how it works. So sorry for the many, many questions to come.

So, our master project is [Portal], separate git repo, we also have another git repo [forms].

So our file structure for development looks like this: [localhost] > portal > forms > etc...

So I have, in SourceTree, a project for Portal and a project for Forms. I was in the Portal project and right-clicked the left menu area and selected 'add link/subtree'. in the setup window, I selected the forms (git) repo url, 'Master' branch (Wasn't sure which to select), and the local file path [localhost] > portal > forms.

That indeed created a subtree. I can see it in the left nav area now [localhost]>forms

I then went into Jira and created a branch from the forms project and tried to check it out in sourcetree, but I wasn't sure where to check it out too as I was expecting to see the branch within the subtree, but alas it wasn't there.

I know I did something wrong here, or, many things wrong here, thank you so much for your time and guidance in helping me understand this process. Looking forward to hearing back from you. In the meantime, I will read the link you sent me.

David Jacobson_3iwxv9

As a caveat, we are not using the command line git process. I was asked to find solutions that don't use command line functions. They are trying to do this using git, bitbucket and SourceTree.

Mikael Sandberg

No worries about the many questions, that is what this Community is all for!

So, I would recommend doing all your changes in each separate subtree and then just bring it all in to your master (Portal) project when needed. You could do all the changes in Portal, but you can run into issues with that where you have a mix of commits both in your subtree and Portal.

Regarding your branch, on your local copy of Forms, if you do a Fetch that will bring in the new branch and you should see it under origins, and from here you can check it out. It will not show up under Subtree in your Portal repository, unless you right-click and select edit to change the branch the subtree is using. A subtree can only be setup to pull from/push to a single branch.

Welcome!

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

Quick Links

Find more posts tagged with

sourcetree

branch

subtree