top button
Flag Notify
    Connect to us
      Site Registration

Site Registration

Is there a way to merge master into the subtree branches in GIT?

+1 vote
401 views

I have a large Git project which I would like to dissect into subprojects with their own repositories. Git subtrees are ideal for this task: I first

  • create a branch with the contents of only one subfoldergit subtree split -P -b

and then

  • pull this branch into another repository.

For a transitional phase, I would like to have the subprojects read-only and sync them from master. The question is how to organize this. For every commit to master, I could of course perform the above procedure repeatedly for all subprojects, but this seems less then ideal since it does all the work all over again.

Is there a way to merge master into the subtree branches?

posted Jun 12, 2015 by anonymous

Looking for an answer?  Promote on:
Facebook Share Button Twitter Share Button LinkedIn Share Button

Similar Questions
+2 votes
How to automatically merge changes from many branches in GIT?

One practice of using git to have one feature per branch.

Let's say a developer has worked on many small features in many branches. Then he sends one pull request to the central (not controlled by him) for each feature he has developed. While he is waiting for all the features be merged into the central repository, he needs to use all these feature locally.

To do so, he may need to merge the changes in these branches to his local master branch. But this can be tedious when he has many branches.

Is there a way to somehow setup a branch so whenever something is committed to the branch, the changes will also be simultaneously committed to the local master branch? By this way, the develop can avoid having to merge changes from many branches.

0 votes
GIT command to get all branches I've merged into develop since a given date?

I need to provide a list of all branches I have merged into develop since a given date.
Can you recommend a git command that will do this?

+5 votes
Is there a way to know when the commit has been in the git server

I know form the "git log" we can now the commit time, but how to know when it is in the remote git server.

+3 votes
Is there a way to clone only specific folders from a remote GIT repository ?

When we clone a remote GIT repository, all folders/files will be cloned. This will consume lot of disk space in our local machine.
Is there a way to clone only few folders & exclude others?

This is possible in clearcase snapshot view by changing load rules.

...