← Back to team overview

brewtarget-devs team mailing list archive

Re: git and ui files


The .ui files *are* a severe pain. I am committed to converting every
single .ui to standard Qt calls inside the C++ source. If all of those are
converted, then we can all just edit and merge in harmony :) I've committed
a few of these so far, and you guys are definitely welcome to take a stab.
It's actually not as bad as you might imagine.

On Wed, Feb 11, 2015 at 3:39 PM, mik firestone <mikfire@xxxxxxxxx> wrote:

> What if we were to mark all the .ui files as binary blobs? git won't try
> to diff them when they change, but should just overwrite the old version.
> The .ui files look like text, but they really are not meant to be
> read/modified by humans.
> I am not certain what will happen when we have a collision, but I am
> hoping git will say "Two different checksums, you figure it out". Which is
> far better than having to crawl one of those .ui files with vim.
> Mik
> --
> In a world of ninja v. pirate, I pilot a Gundam
> --
> Mailing list: https://launchpad.net/~brewtarget-devs
> Post to     : brewtarget-devs@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~brewtarget-devs
> More help   : https://help.launchpad.net/ListHelp

Dr. Philip G. Lee