Hello,

does anyone know why Git does not resolve changes automatically to 
translation files e.g. following change should be resolved automatically 
not being shown as a conflict. Should I teach Git the messages file 
notation?

#
yyy = some text1

#
<<<<<<<
ccc = some text text
=======

#
ccc = some text
>>>>>>>

#
xxx= some text2


Best regards,
Markku

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to