Hi guys,
2015-01-27 22:04 GMT+01:00 Tim E. Real <[email protected]>: > On January 27, 2015 10:03:39 PM Andrew Deryabin wrote: >> Hi Tim! >> >> The evening, and at last put my hands on persistent_ports branch. >> >> Quick report: It works!!! Awesome! Haven't had time to test it yet but I'll hopefully get there sooner rather than later. <...> >> P.S. I also successfully merged persistent_ports branch to my qt5 branch >> without any conflict at all! So, my last question is still alive :) > > Ah yes. So I should continue to develop in my branch? > Correct? My opinion is that you can stay in your branch but we do this: 1. Andrew pushes some fixes back to main 2. We release that as 2.2.1 3. push Qt5 to main 4. And before you make any major changes, Tim, make a pull from main and commit that to your branch. This to limit future conflicts. How's that? Regards, Robert ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Lmuse-developer mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmuse-developer
