<div dir="ltr">There should be none. There might be a 100 commits (the dxs history) instead of the current 1 commit, but the end result of those 100 will be the same. </div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Wed, Oct 23, 2013 at 1:11 PM, Tim Moody <span dir="ltr"><<a href="mailto:tim@timmoody.com" target="_blank">tim@timmoody.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">
<div dir="ltr">
<div style="font-size:12pt;font-family:'Calibri'"><div class="im">
<div>>Exactly! I also think it is a risk to have "development" being done in
xsce:dxs. I would be in favor of just creating a xsce:dxs with all the dxs
commits, so we don't lose the history, and then we just merge that to the
xsce:master branch and just continue working there.</div>
<div>></div>
<div>>WhatSay?</div>
<div> </div>
</div><div>OK, but what happens to the development I or anyone else has been doing in
a branch off the fork of the current xsce when we do a PR? I think there
will be conflicts.</div>
<div> </div></div></div></div>
</blockquote></div><br></div>