[Server-devel] [XSCE] XSCE/xsce and activitycetral/dxs repository integration in a branch preserving history

[Tim Moody]

>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.
>
>WhatSay?

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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.laptop.org/pipermail/server-devel/attachments/20131023/5b1295d6/attachment.html>