I had created a pull request for the same, https://github.com/XSCE/xsce/pull/9
But it wasn't merged, as Santi suggested that it be done directly on the main XSCE repo rather than on a fork. On Thu, Oct 24, 2013 at 10:52 AM, Anish Mangal <an...@activitycentral.com>wrote: > 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 > >
_______________________________________________ Server-devel mailing list Server-devel@lists.laptop.org http://lists.laptop.org/listinfo/server-devel