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
I've been searching for hours - Help! :)
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 email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at