Comments for Making Software

Comment on Using Git subtrees for repository separation by Igor

Igor — Tue, 03 Feb 2015 00:44:41 +0000

Hi Jochen, have you been able to solve the issue? I’m running into the exact same problem: Pull > merge conflict, Push > rejected. I’m stuck.
Thanks, Igor

Comment on Using Git subtrees for repository separation by Stu

Stu — Fri, 30 Jan 2015 18:15:23 +0000

I was using the History view in Git Source Control Provider for Visual Studio. It's okay for simple branches but can get quite confusing when things get more complex.

Comment on Using Git subtrees for repository separation by Horst

Horst — Fri, 30 Jan 2015 15:47:51 +0000

Hi there. Can you tell me what program you used in the screenshot to visualize your git repository?

Comment on Using Git subtrees for repository separation by Nobita

Nobita — Tue, 16 Dec 2014 12:15:49 +0000

Amazing stuff. I would love to be able to sort of cherry pick only the relevant files that I need instead of pulling in the whole repo, but still this seems to be a much better approach than submodules, at least in my case. Also, the ability to push changes to the upstream repo is great.

Thanks for the post, I think this feature should be more documented as I can’t find that much of information around about it.

Comment on Using Git subtrees for repository separation by Aaron Seet (@icelava)

Aaron Seet (@icelava) — Wed, 05 Nov 2014 08:50:54 +0000

Each time I clone the super-repo, or checkout a new branch, it seems to me that it is necessary to perform the entire sequence again

– remove sub-directory of the sub-repo; commit
– add/fetch remote branch of the sub-repo
– configure subtree linkage to local remote branch

What we have are both super-repo and sub-repos having branches targeting a deployment environment (e.g. Test, Staging). So say the Test branch of the super-repo should be referencing the Test branch of the sub-repos. Correspondingly, the Staging branch uses sub-repos’ Staging branch code.

Would have been nice if these configurations somehow are preserved in the super-repo’s git config. Then anybody cloning the repo wouldn’t have to go through these hassles again.

Comment on Using Git subtrees for repository separation by Eric

Eric — Mon, 27 Oct 2014 17:34:08 +0000

BTW, for those who use –squash with subtree add, pull, etc. (because they want to avoid mixing subtree repo history and parent project history), if they want to use a defined remote for convenience, they should also use “git remote add –no-tags …”. The –no-tags will exclude bringing over any tags into the remote tracking branch. That is what causes trouble for bringing in unwanted subtree history into the parent repo.

Comment on Using Git subtrees for repository separation by Eric

Eric — Fri, 03 Oct 2014 13:20:59 +0000

p.s. To be more clear, I have not encountered the problem as yet, but I do use –squash for all subtree pushing and pulling.

Comment on Using Git subtrees for repository separation by Eric

Eric — Fri, 03 Oct 2014 13:11:31 +0000

@Jochen, multiple posters on StackOverflow have had this problem as well. Have you been using –squash for all your subtree pushing and pulling? What version of Git are you using and on what platform?

Comment on Using Git subtrees for repository separation by assertion failed errors when trying to git subtree split

assertion failed errors when trying to git subtree split — Thu, 28 Aug 2014 23:22:54 +0000

[…] to split a subfolder in this repo into a new subtree repo. I’m following these instructions Using Git subtrees for repository separation (under Splitting code into its own […]

Comment on Using Git subtrees for repository separation by Merging subtree split to another branch: Is it safe?

Merging subtree split to another branch: Is it safe? — Wed, 06 Aug 2014 01:03:28 +0000

[…] say I setup a subtree in branch A, following the instructions in this guide. Once I have it all setup, what happens when I merge branch A into branch B later? Obviously […]