# Unexpected diff patch

1 messages from 2021-08-27 to 2021-08-27. Participants: Eugen Konkov.
Thread: https://gitlist.dev/t/56387

## Eugen Konkov, 2021-08-27 19:17

Subject: Unexpected diff patch
Message-ID: <53444163.20210827221756@yandex.ru>
URL: https://gitlist.dev/e/53444163.20210827221756%40yandex.ru

```
Hello.

I try to rebase my code.
and unexpectedly got conflict.

It occur because on one branch to source file spaces were added
and on other branch some line was changed

See attached expected and actual diffs


While rebasing I use next command:
git rebase --ignore-whitespace --merge -s recursive -X ignore-space-change -X ignore-space-at-eol -X ignore-cr-at-eol dev

Do I miss someoption to escape from this conflict?
If there is no such an option, could I ask to implement an option to ignore changes at spaces, please.
(see attached expected diff)

Thank you

--
Best regards,
Eugen Konkov 
```