[parted-devel] Re: indentation changes render parted/ui.c nearly unmergeable

[Jim Meyering]

Debarshi 'Rishi' Ray <debarshi.ray at gmail.com> wrote:

>>> If we were all to agree to reformat *both* the stable branch and
>>> the trunk, then we'd be done, modulo any pending patches relative
>>> to the pre-global-format date.  Modulo the little detail of deciding
>>> on a formatting style, and installing a hook or two to help people
>>> check and adhere to the standard.
>
> I have a small confusion. Are you saying that reformatting all the branches
> would be make things easier, or more cumbersome?

Easier.  Then new patches to one would still apply to the other.