|
| From: | Marx |
| Subject: | Re: merging branches |
| Date: | Fri, 16 Feb 2007 16:00:20 +0100 |
| User-agent: | Thunderbird 1.5.0.9 (Windows/20061207) |
Peter Connolly napisał(a):
So go ahead and use -kkv. Even if you're using $Revision$ in your code, do you really care if it's changed during merges??? On 2/12/07, Marx <address@hidden> wrote:How to merge branches with -kkv? I need revisions, because they are used in code as values, so I can't switch off this feature Marx
If I merge with -kkv, there are conflicts like >>>>>>>> <<<<<<<< and I must fix it manually Marx
| [Prev in Thread] | Current Thread | [Next in Thread] |