search

mezis / git-whistles

A set of bells and whistles for your Git.
Other
64 stars 15 forks source link

Proper 3-way PO merge #39

Closed mezis closed 9 years ago

mezis commented 9 years ago

A completely rewritten PO merge driver, with tests.

The original one was 2-way only (it would ignore concurrent changes on the local branch), and the one I patched in days ago was brittle and had too many dependencies (Perl, msghack). This relies just on Gettext-fu and Sed.

Oh, and tests, too!

mezis commented 9 years ago

@pedrocunha, feel like reviewing this?

pedrocunha commented 9 years ago

This looks good :) remenber to update the releases changelog if you release a new version with this :)

mezis commented 9 years ago

remenber to update the releases changelog!

I will! thanks a bunch for the input.