{"thread":{"id":"56387","subject":"Unexpected diff patch","startedAt":"2021-08-27T19:18:05Z","lastAt":"2021-08-27T19:18:05Z","messageCount":1,"participants":["Eugen Konkov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"433949","messageId":"53444163.20210827221756@yandex.ru","threadId":"56387","inReplyTo":null,"subject":"Unexpected diff patch","fromName":"Eugen Konkov","fromEmail":"kes-kes@yandex.ru","sentAt":"2021-08-27T19:17:56Z","receivedAt":"2021-08-27T19:18:05Z","isPatch":false,"sender":{"key":"kes-kes@yandex.ru","avatar":null},"body":"Hello.\n\nI try to rebase my code.\nand unexpectedly got conflict.\n\nIt occur because on one branch to source file spaces were added\nand on other branch some line was changed\n\nSee attached expected and actual diffs\n\n\nWhile rebasing I use next command:\ngit rebase --ignore-whitespace --merge -s recursive -X ignore-space-change -X ignore-space-at-eol -X ignore-cr-at-eol dev\n\nDo I miss someoption to escape from this conflict?\nIf there is no such an option, could I ask to implement an option to ignore changes at spaces, please.\n(see attached expected diff)\n\nThank you\n\n--\nBest regards,\nEugen Konkov "}]}