On Tue, Feb 10, 2015 at 12:03:20AM -0800, Markku Nikkanen wrote: > 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?
If your translation files are plain text then it *does* merge properly, *when it can*. It's not easy to see from your email why it encounters a conflict in this particular case. I'm sure that if you were to provide a bit more information someone on here would be able to explain it. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus What gets measured, gets done. -- Tom Peters -- 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.
Description: PGP signature