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

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

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

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,

[git-users] Re: Looking to auto-update a GIT local repo (on Windows Server) when bare repo on redmine is pushed to

Hi, You could just set up a scheduled task on the Windows server that checks for changes and does a pull (in a batch script). Personally, I've developed a taste for using my company's CI-system (continuous integration) for this kind of work. Think of it as a neat place to run scheduled