Gilad, I found the easiest way to avoid the conflicts in the location files is to not add your new messages at the bottom of the file like everyone else. I try to find messages that are related to what I am working on and put my new messages there. Since everyone puts their new messages at the bottom, and mine aren't at the bottom there are no conflicts for me. Or at least they are much rarer. Alexander On Tuesday, June 03, 2014 03:06:49 AM Gilad Chaplik wrote:
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?
Thanks, Gilad.
_______________________________________________ Devel mailing list Devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/devel