[ovirt-devel] conflicts in constants file

Gilad Chaplik gchaplik at redhat.com
Tue Jun 3 07:06:49 UTC 2014

Hi Vojtech, 

it seems that foreach rebase I do I get git conflicts for constants files (java iface localization files).

do you have a way to solve that?


More information about the Devel mailing list