I have a project where I've merged in a library using Git subtree. I've pushed and pulled a few minor changes between the library and the project. Later on, a new repository has been created which is the definitive home for the library. It contains essentially the same version of the library code as my project did, with perhaps one or t...
Let's assume the following data structur with three numpy arrays (id, parent_id) (parent_id of the root element is -1): import numpy as np class MyStructure(object): def __init__(self): """ Default structure for now: 1 / \ 2 3 / \ 4 5 """ self.ids = np.array([1,2,3,4...
If I do this in one of my repositories: git subtree pull --prefix=frameworks/AquaticPrime --squash AquaticPrime I get this: Working tree has modifications. Cannot add. If I do this (in the same place, of course): git status I get this: # On branch master nothing to commit (working directory clean) I'm not quite sure what's g...
I'm trying to convert an old CVS repository tracking a vendor branch to git, and I'm running into a merge issue. The repository is structured like this: dir1/ dir2/ dir2 comes from the upstream branch. Upstream converted to git already, and dir2 in our repo is the root of their git repo. I want to add them as a remote and merge their...
I've been trying to move away from submodules in order to get a self-contained repository, and the subtree merge strategy seems to match this use-case. However the merged repos' histories appear in my own project's history, which is reather annoying. I've tried git filter-branch --subdirectory-filter path/to/subtree/ HEAD which works.....
To include a few external git repositories in my "main" repository, there are a few options: submodules braid subtree The first seems to be advised against by basically everybody. The second and third I believe are implementations of the subtree pattern. Is one better? Which should I use? Why? How can I choose between them? ...