[ovirt-devel] conflicts in constants file

Vojtech Szocs vszocs at redhat.com
Thu Jun 5 17:00:47 UTC 2014

Hi Gilad, sorry for my late reply :(

Just like Alex suggested, you can simply put your changes near
existing constants which are related to what you're working on.

(Or maybe try to reuse existing constants, if possible.)

I agree that currently we have huge (Common)ApplicationConstants
files, however for future we were considering using alternative
i18n implementation which could retrieve constants at runtime,
essentially eliminating "locale" permutation vector during GWT
compilation, speeding up GWT compile times. (With this approach,
constant values wouldn't be "baked into" JavaScript application,
but rather exposed for use at runtime.)


----- Original Message -----
> From: "Alexander Wels" <awels at redhat.com>
> To: devel at ovirt.org
> Cc: "Gilad Chaplik" <gchaplik at redhat.com>, "Vojtech Szocs" <vszocs at redhat.com>
> Sent: Tuesday, June 3, 2014 2:16:22 PM
> Subject: Re: [ovirt-devel] conflicts in constants file
> 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 at ovirt.org
> > http://lists.ovirt.org/mailman/listinfo/devel

More information about the Devel mailing list