[emft-dev] Re: [m2t-dev] Re: [xtext-dev] Xtext, Xpand, MWE 1.0.1 (SR1) r

[Miles Parker <milesparker@xxxxxxxxx>]

On Aug 24, 2010, at 1:02 AM, Moritz Eysholdt wrote:
>> BTW, a bit off-topic but we're finding that Git or at least EGit doesn't work so well for merging files with multiple edits -- which is of course exactly the kind of thing that it is supposed to be good at -- are people using cmd-line git or what to handle this stuff?
>>  
> 
> How about letting the branches diverge less by doing a rebase from time to time or doing an intermediate merge?

Actually, because of the kind of distributed and interactive modeling we do and since I am usually doing continuous integration on all of our in-house projects we usually integrate very frequently, sometimes many times a day. (In a way this used to work better with a pessimistic locking system such a Perforce, which is sort of on the opposite extreme of Git.) And we can't avoid stepping on each other fairly frequently. The CVS and SVN team tools are actually quite good at quickly working through diffs -- but I haven't been able to uncover something like this in EGit..

cheers,

Miles