[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CEDET Merge

From: Stephen Leake
Subject: Re: CEDET Merge
Date: Tue, 17 Jan 2017 15:22:48 -0600
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (windows-nt)

Edward John Steere <address@hidden> writes:

> This brings us to the topic of collaborating on this change.  I'm not
> aware of any strategy for merging which allows for collaboration; so
> I've come up with the following hack (comments/adjustments welcome):
>  1. create a staging repository for CEDET and make the requisite folder
>     structure changes in it

I guess that's on SourceForge

>  2. create a branch in the Emacs project and merge allowing unrelated
> histories 

I'm not clear what you are merging here. It should not be the whole of
CEDET; step 3 should be done first.

> 3. delete any files outside of our target folders and commit with
> unresolved conflicts 

That gives us a shared base to work on.

> 4. push up the branch and divvy out files/folders for fixing conflicts


> 5. commit and push as we go


> If this sounds like something you'd like to be involved in then I'll
> start with steps 1.->3. and follow up when I'm done.  

Makes sense.

-- Stephe

reply via email to

[Prev in Thread] Current Thread [Next in Thread]