On Sat, 2 Jul 2011 02:22:44 -0700 (PDT)
Sean <seanatconne...@gmail.com> 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?
> I've been searching for hours - Help! :)

Look at the "filter" facility of Git attributes [1].

1. http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to