Re: [Gramps-devel] how can I handle merges in git pull?

[Vassilii K. <vas...@ta...>]

On 30.12.2013 23:12, Enno Borgsteede wrote:
> when changes
> are made to nl.po, I want to merge them with my local version of that
> too
This is something that will be pretty difficult, no matter what the 
underlying version control system, due to the way the .po files are 
generated :-( The problem is that the diff context of the .po files has 
things like
../gramps/foo/bar.py: 12354
../gramps/goo/dar.py: 23536
which keeps changing, so any change to the .py files processed via the 
POTFILES will generate a merge conflict on the .po file which is pretty 
hopeless to resolve using the usual methods good for .py and other sources!

What I do instead is to have a single authoritative .po at the master 
branch, which I then merge to other branches using "msgmerge". When I 
have a private dev branch tracking master, I just copy the .po file off 
master to it w/o any merge. When I was doing longer work --- with bug 
6926 --- I had my "main" ru.po on that bug's branch, scheduling things 
in such a way w.r.t. the gramps release plans so that I didn't need to 
update the translation strings on master at all until I could merge that 
bug's branch.

It could be that there is some know-how of doing it faster and cleaner, 
though --- I just haven't found out how!

V.