<HTML><HEAD></HEAD>
<BODY dir=ltr>
<DIV dir=ltr>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">
<DIV>my branch will be one commit behind, the commit of the merge of dxs into
master</DIV>
<DIV> </DIV>
<DIV style="FONT-SIZE: 12pt; FONT-FAMILY: 'Calibri'; COLOR: #000000">Tim</DIV>
<DIV
style="FONT-SIZE: small; FONT-FAMILY: 'Calibri'; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; TEXT-DECORATION: none; DISPLAY: inline">
<DIV style="FONT: 10pt tahoma">
<DIV> </DIV>
<DIV style="BACKGROUND: #f5f5f5">
<DIV style="font-color: black"><B>From:</B> <A title=anish@activitycentral.com
href="mailto:anish@activitycentral.com">Anish Mangal</A> </DIV>
<DIV><B>Sent:</B> Wednesday, October 23, 2013 4:17 PM</DIV>
<DIV><B>To:</B> <A title=xsce-devel@googlegroups.com
href="mailto:xsce-devel@googlegroups.com">xsce-devel</A> </DIV>
<DIV><B>Cc:</B> <A title=server-devel@lists.laptop.org
href="mailto:server-devel@lists.laptop.org">server-devel</A> </DIV>
<DIV><B>Subject:</B> Re: [XSCE] XSCE/xsce and activitycetral/dxs repository
integration in a branch preserving history</DIV></DIV></DIV>
<DIV> </DIV></DIV>
<DIV
style="FONT-SIZE: small; FONT-FAMILY: 'Calibri'; FONT-WEIGHT: normal; COLOR: #000000; FONT-STYLE: normal; TEXT-DECORATION: none; DISPLAY: inline">
<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="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid">
<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>
<DIV> </DIV></DIV></DIV></DIV></DIV></BODY></HTML>