Hi,
Sean has left the following comment at Demonstrate merging two independent
repos with GIT, write tutorial
http://www.google-melange.com/gci/task/view/google/gci2012/7992230:
should merge
It should merge the two change sets. The trick is getting git to recognize
that those are the same two files and that it needs to merge their
independent changes. Basically, a conflict is fine if it runs into one and
I would expect some.
What is meant by that other statement is that we have this actual problem.
We have a bunch of changes in a subdirectory of our svn tree
(src/other/step) where we've made tons of changes. Completely
independently, there's another project out there (stepcode on github) that
has their own (very similar but sufficiently different tree).
The general idea is to svn2git our subtree, fork their tree, and merge the
two repos. We'll later merge/pull our changes back into the stepcode tree.
This is either a VERY easy task or a very difficult one to automate.
Greetings,
The Google Open Source Programs Team
---
You are receiving this message because you are subscribed to Demonstrate
merging two independent repos with GIT, write tutorial.
To stop receiving these messages, go to:
http://www.google-melange.com/gci/task/view/google/gci2012/7992230.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_123012
_______________________________________________
BRL-CAD Tracker mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-tracker
