How do I merge a subtree using Sourcetree?

[Jeff Osia]

I am new to GIT and I am trying to do what I was doing in SVN with externals.  Any help is appreciated.

[Mikael Sandberg · Accepted solution]

Have a look at https://www.atlassian.com/git/articles/alternatives-to-git-submodule-git-subtree and https://mirrors.edge.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html

I would also recommend https://www.atlassian.com/git/, it has a lot of helpful tutorials and articles.

[Jeff Osia]

Thank You.  I still cannot find what I am looking for.  Maybe subtree is not the right solution for the problem.  I am trying to share a project between 2 .NET solutions.  When I change code in 1, I want the code to change automatically in the other.

[Jeff Osia]

Is the command line the only option for merging subtrees using Sourcetree?

[Mikael Sandberg]

Git subtree will not change the code automatically, it creates a copy of the subtree so you can make changes to it and then push it back to the subtree if you want to share your changes.

The closest to automatically update the code between two solutions would be symlinks. Check out https://github.com/git-for-windows/git/wiki/Symbolic-Links#creating-symbolic-links. You would still have to push/pull manually to make sure your repositories are up-to-date.

[Jeff Osia]

Thank you very much.  I will check it out.

[Mikael Sandberg]

You can merge subtrees from within Sourcetree too, it does not have to be done from the command line. It has been a while since I used it, but I did notice that when you upgrade Sourcetree it used to loose the connections to the subtree repositories so you would have to manually add them back, not sure if this has been fixed yet.

[Jeff Osia]

I noticed that today.   My subtree was not there when I pulled up sourcetree.  I will  try upgrading.  Thank You.