[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lwip-devel] devel vs stable cvs
|
From: |
Leon |
|
Subject: |
Re: [lwip-devel] devel vs stable cvs |
|
Date: |
Tue, 18 Nov 2003 15:31:43 +0100 |
Hello,
> I do that on a different project. Tag before and after merges so that
> repeated merging doesn't cause conflicts.
>
Yes, it works.
> It also helps to turn off keyword expansion during the merge to get less
> conflicts and turn them on again later.
>
All in all, this costs a *lot* of time is my experience.
Regards,
Leon.