My program uses gettext, so the *.po files get modified whenever a
"make dist" is run.  Usually this just updates the "POT-Creation-Date"
timestamp line.  As a result, whenever I try to merge two branches,
all the *.po files inevitably conflict.  I then have to go through all
40 or so of these files and delete one of the timestamp lines and the
conflict markers.

Is there some way to tell git merge that if a file meeting the pattern
"po/*.po" has been modified in both branches, to simply keep one or
the other, rather than generating files with conflict markers?


David Bruce

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-us...@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to