git - Subtree merge into multiple directories -

-

i have 2 repositories , 1 of them (shared) contains shared libraries used code in other 1 (main).

main +--- foo |    +--- shared |    +... +----bar |    +--- shared .    +...

i have added shared remote local main working copy , i'm trying merge master branches using subtree strategy:

git merge --squash -s subtree shared/master

this command automagically finds appropriate directory , merge. however, when there more 1 place shared branch should merged into, merges 1 place (looks it's taking first 1 in alphabetical order).

is there way force continue , merge matching places?


Comments

Post a Comment

Popular posts from this blog

javascript - How to name a jQuery function to make a browser's back button work? -

-
i'm trying write function ajaxyfy web site, works perfect, except function button. that's have now: function loading() { if (typeof history.pushstate !== "undefined") { var historycount = 0; $('.menu-item, .logo').on('click','a',function(e){ e.preventdefault(); $(this).data('clicked', true); if ($(this).is('.logo a')) { var homepage = $(this).attr('href'); function1(homepage); history.pushstate(null, null, homepage); } else if ($(this).is('.projects a')) { var projects = $(this).attr('href'); function2(projects); history.pushstate(null, null, projects); } else { var pages = $(this).attr('href'); function3(pages); history.pushstate(null, null, pages); ...
Read more

python - Django-easy-pdf: xhtml2pdf reporting reportlab 2.2+ is required, but 3.0 installed -

-
i'm trying give django-easy-pdf go, i'm having problems installing dependencies. i importerror: no module named xhtml2pdf.default when running django. to attempt fixing, did pip install xhtml2pdf , yields could not find downloads satisfy requirement pypdf (from xhtml2pdf) . so let's pip install --allow-unverified pypdf pypdf around that. completed without issues. when repeating pip install xhtml2pdf , software gets installed without issue. however, when launching django 1.6, get: importerror: reportlab version 2.1+ needed! . i have reportlab 2.2 or higher installed though, since pip freeze lists 3.0. it looks hardcoded in few files ( util.py , __init__.py ): if not (reportlab.version[0] == "2" , reportlab.version[2] >= "1"): raise importerror("reportlab version 2.1+ needed!") if not reportlab22: raise importerror, "reportlab toolkit version 2.2 or higher needed" how can fixed (except remove these c...
Read more

collision detection - C++ library for mesh to mesh intersection: what is available? -

-
i need calculate volume intersection , penetration depth between 3d triangular meshes (e.g. in .obj format), quite new computational geometry. in previous post ( mesh mesh intersections ) , google search, found few c++ libraries might appropriate job: cgal pqp libigl swift though, not sure 1 appropriate beginner. suggestion? libigl of version 1.1 has robust mesh boolean operations in igl/boolean/mesh_boolean.h . uses either implementation using cgal's exact arithmetic kernel or wrapper of cork (another option you). for now, libigl contains patched version of cork in libigl/external/cork , improves robustness. while implementing libigl's boolean ops, found cork faster not produce correct result (specifically, fails resolve intersections). libigl, using cgal backend, robust , still fast compared converting mesh cgal's nef_polyhedron , conducting csg operations , converting mesh. final conversion possible if result manifold. instead, libigl use...
Read more