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

[Tim Moody]

my branch will be one commit behind, the commit of the merge of dxs into master

Tim

From: Anish Mangal 
Sent: Wednesday, October 23, 2013 4:17 PM
To: xsce-devel 
Cc: server-devel 
Subject: Re: [XSCE] XSCE/xsce and activitycetral/dxs repository integration in a branch preserving history

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. 



On Wed, Oct 23, 2013 at 1:11 PM, Tim Moody <tim at timmoody.com> wrote:

  >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/344aeb81/attachment.html>