Why are there conflicts with git rebase -p -i?

I use

 git rebase -p -i SHA1^

And moving one latch back in time immediately after SHA1. The end consists of a WAV file, so this does not break my code.

It seems that unrelated files appear in conflicts later in the story. Why am I getting these conflicts during reinstallation in this scenario? Isn't it enough -p to keep in touch with other parts of the story? There is something about recharging, I won’t catch here completely ...

+3
source share
1 answer

- . - . , , , , .

+2

Source: https://habr.com/ru/post/1721381/


All Articles