dpkg's main repository branch, master, updated. 1.14.20-100-g4174eea
Raphael Hertzog <email@example.com> writes:
> On Sun, 06 Jul 2008, Christian Perrier wrote:
>> I'm not convinced this would be a great idea to merge po/ directories
>> with the VCS merge facilities.
> If we have conflicts, the merge is a pain and we should use msgmerge to
> merge properly both files.
> But if we have no conflicts (because the po files have not been modified
> since the creation of the branch that we're merging), then the VCS merge
> functionnality is fine...
Not that I have time to write this, but Git does support custom merge
drivers and Christian's merge strategy could, I think, be implemented in
one. Then Git would use msgmerge automatically for conflicts between *.po
gitattributes(5) has the details under "Defining a custom merge driver."
It looks like the only hard part would be finding the *.pot file with
which to msgmerge.