All, I'm happy that DSpace is now hosted officially on github, it's a great place for code to live! I'm having a problem with my normal git routine, though...
I set out to test upgrading our DSpace 1.7.x to 1.8.x and I noticed that there are some continuity issues in the history between branches[2]; on clean clone of the official DSpace repo[1], I cannot merge 1.8.x changes into 1.7.x without getting hundreds of merge conflicts: git clone https://github.com/DSpace/DSpace cd DSpace git checkout -b 1.8.2-test origin/dspace-1_7_x git merge origin/dspace-1_8_x Maybe Peter or someone else more involved in the SVN -> git transition can comment about? If this is a known issue with no fix, maybe I should just rebase our local changes on top of 1.8.x? Thanks! [1] http://github.com/DSpace/DSpace [2] graphical view of branches: http://img6.imagebanana.com/img/0bcnxp6y/gitkDSpace_010.png -- Alan Orth [email protected] http://alaninkenya.org http://mjanja.co.ke "I have always wished for my computer to be as easy to use as my telephone; my wish has come true because I can no longer figure out how to use my telephone." -Bjarne Stroustrup, inventor of C++ ------------------------------------------------------------------------------ Better than sec? Nothing is better than sec when it comes to monitoring Big Data applications. Try Boundary one-second resolution app monitoring today. Free. http://p.sf.net/sfu/Boundary-dev2dev _______________________________________________ DSpace-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dspace-tech
