[Server-devel] The DXS merging confusion

[Anish Mangal]

I hope to clarify the consensus that was reached yesterday w.r.t merging
DXS changes.

History:
Step #1: We copied all the files from DXS over to the XSCE repo without
preserving the history

Now,
What we need is to be in essentially in the same place, but *with* the
history. The suggested way to do that is.

* Revert Step#1.
* Create a branch "dxs" on xsce:master.
* Pull in all DXS commits into that branch.
* Merge that branch into xsce:master.

That way, we will be in the same state as we are now, but with all the
commits of DXS preserved.

Hope this helps.

Best,
Anish
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.laptop.org/pipermail/server-devel/attachments/20131024/261e112c/attachment.html>