<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Mar 14, 2013 at 9:26 PM, Matt Jadud <span dir="ltr"><<a href="mailto:matt@jadud.com" target="_blank">matt@jadud.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div>How best to handle branches? Do we export those separately, and then use git to merge things together? Or, do we do any branch merging/resolution first, and then move? (The former is easier, in some ways, but I don't know what makes the most sense.)</div>
<div><br></div><div>Some of the branches can go away, but some have things that I would like to hold on to. For example, last year a student started working on library/port of Carl's new scheduler; that code should be brought over. It could be done either by 1) saving the branch and merging the code, or 2) merging into the trunk and then re-running. (At that point, we should think about all of the branches, to save the number of export/import cycles.)</div>
<div></div></blockquote></div><br><br></div><div class="gmail_extra">Which branches are you talking about? All branches under <a href="https://projects.cs.kent.ac.uk/projects/kroc/svn/kroc/branches/">https://projects.cs.kent.ac.uk/projects/kroc/svn/kroc/branches/</a> are already included.<br>
<br>--<br></div><div class="gmail_extra">M<br></div></div>