Re: ignore blank line removals

From: John Rood <mr.john.rood@gmail.com>
Date: Nov 15, 2016, 17:56 UTC
Message-ID: <CALj-rGdRDa0EU6AeMHWYketr5QBOnV7-3RKraiuPCk=Aepz=pQ@mail.gmail.com>
In-Reply-To: <CALj-rGcSrbAiyxPOYD1KCacK_gqi3T5_R=e0H_UfBTqLb5VRmg@mail.gmail.com>

Is there any push-back on this, or is there a backlog that we can add this feature to?

On Thu, Nov 3, 2016 at 10:57 AM, John Rood <mr.john.rood@gmail.com> wrote:

Show 17 quoted lines

> If the contents of a file initially are:
>   one
>
>   three
> and on branch A there is a commit, removing the blank line:
>   one
>   three
> and on branch B there is a commit, adding 'two':
>   one
>   two
>   three
> Normally, if you try to merge A into B (or B into A), git recognizes a
> decision needs to be made between removing the second line or add
> "two" to the second line. It would be convenient to have a merge
> strategy that defaults to the latter in cases where the removed line
> was a blank line (or a line containing only whitespace) ...something
> like -Xignore-blank-line-removals.