[Tracks-discuss] Re: Merging epall/tracks master to bsag/tracks

[Tim Madden]

Great work!  I want to try it out, but I have one question.  I am currently running Henrik's dependencies branch (and I am quite dependent on it!  Thank you very much!) but I do not think the  the code for dependencies is in the core dev branch yet.  If I try to git pull the core dev branch into my dependencies branch, I get lots of conflicts as the same file has been merged in both.  As I understand it, you have manually edit the files to resolve the conflicts.  I started to try to do that, but it was a little beyond my understanding and since some lines were changed in both branches I was pretty sure I would probably end up with garbage at the end.  As a result, I just reset back to HEAD. So, my questions are: If I run my tracks database that has the schemea of the dependencies branch on the core branch code, will it choke or the new information just sit there unused until the code for dependencies is brought in? What would it take to bring henrik's changes into the core branch? Thanks! Eric Allen wrote: It is done! Core tracks now has jQuery and dependencies support. I think it's time we start pushing some tickets off to 1.9 and get ready for a 1.8 release. On Dec 5, 2009, at 8:57 AM, Reinier Balt wrote: I think the sooner the better because people are running your dependency tree and others the main tree. Reports are coming in from both trees…   Besides, I’m curious / excited about the dependency stuff :-)   Reinier   Van: tracks-discuss-boun...@lists.rousette.org.uk [mailto:tracks-discuss-boun...@lists.rousette.org.uk]Namens Eric Allen Verzonden: vrijdag 4 december 2009 18:45 Aan: track-discuss Onderwerp: [Tracks-discuss] Merging epall/tracks master to bsag/tracks   Hey everybody, I've finished integrating Henrik's dependencies branch with my jQuery updates on epall/tracks master, and I think it's time to merge to trunk. There are still some things we need to touch up, but I'd rather do that on the main branch now that the stuff is stable. Does that seem reasonable?   -Eric _______________________________________________ Tracks-discuss mailing list Tracks-discuss@lists.rousette.org.uk http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss

_______________________________________________
Tracks-discuss mailing list
Tracks-discuss@lists.rousette.org.uk
http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss