Hi,
Cezar 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:
Couple of questions
What happens if dir1/file1 is edited in both repoA and repoB? Should you be
prompted to solve the conflicts, or automatically choose the newer version?
Also, "You can [...] use our actual sub-project sources that have this
issue". I don't understand this very well. What are sub-project sources
(libbu, for example?) and what is the issue (if libbu is a sub-project
source, are there two repositories containing libbu?)
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. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
BRL-CAD Tracker mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-tracker
