On Mon, 6 Jul 2015 11:53:26 -0700 (PDT) Konrád Lőrinczi <klorin...@gmail.com> wrote:
> > Remove the it! If you aren't using CVS those lines serve no > > purpose at all. Even if you do use CVS the line is of dubious > > usefulness. > > Unfortunately I can not remove them. > They are in an earlier branch of a software repo, which has more > thousand files. > So I need a solution, where I can keep original repo, but still can > merge with my fork, without solving conflicts in more thousand files > because of cvs indents. So which repo contains expanded keywords? If yours, then do a recursive `sed` (or whatever) invocation on all that thousand of files and make a single commit titled "Normalize CVS keywords". Then merge normally. If the foreign repo contains expanded keywords, may be `git rerere` might be of help -- it's specifically designed to remember how you resolved past merge conflicts. Still, I can't completely comprehend your situation: the foreign repo supposedly should contain unexpanded keywords because to me, the only sensible way to get a repo with expanded keywords is to have it converted from the source one using some brain-dead tool; or may be you have just done `git add .` on a CVS checkout? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
