# Disable merge conflicts on on non-conflicting changes to subsequent lines

1 messages from 2012-01-31 to 2012-01-31. Participants: Marcin Wiśnicki.
Thread: https://gitlist.dev/t/29487

## Marcin Wiśnicki, 2012-01-31 10:55

Subject: Disable merge conflicts on on non-conflicting changes to subsequent lines
Message-ID: <CAC9GOO8GzvezgLH=2F735u=k+-5_1wMsZPbK4sy656dxMvCv3Q@mail.gmail.com>
URL: https://gitlist.dev/e/CAC9GOO8GzvezgLH%3D2F735u%3Dk%2B-5_1wMsZPbK4sy656dxMvCv3Q%40mail.gmail.com

```
If two subsequent lines are changed in different branches, merging
will result in conflict event if there isn't any.
Invoking merge tool will mark file as resolved automatically.

Is there a way to disable this behavior ? I want the merge to happen
automatically if possible.

```