Re: [git-users] Merge Hell - need to filter out lines of code

2011-07-02 Thread Konstantin Khomoutov
On Sat, 2 Jul 2011 02:22:44 -0700 (PDT) Sean wrote: > An IDE I am using is peppering my external source code files with > timestamps and versions. > > These files will not auto merge which is a total bind. > > How can I get git to ignore certain lines of code during a merge, pull > or diff? >

[git-users] Merge Hell - need to filter out lines of code

2011-07-02 Thread Sean
An IDE I am using is peppering my external source code files with timestamps and versions. These files will not auto merge which is a total bind. How can I get git to ignore certain lines of code during a merge, pull or diff? I've been searching for hours - Help! :) -- You received this messag