@partounian thanks for raising the issue but without more details I'm going to have to close this out as I don't have the time to investigate how to reproduce this. I'm able to see conflicts during rebases or merges. Please also ensure that your issue isn't tied to existing issues about not being able to see the markers.
I will close this out (as I only get moments to deal with issues and would rather not have empty issues open) but feel free to re-open it with a minimal config and some example of how I can reproduce this issue 🙏🏾
@partounian thanks for raising the issue but without more details I'm going to have to close this out as I don't have the time to investigate how to reproduce this. I'm able to see conflicts during rebases or merges. Please also ensure that your issue isn't tied to existing issues about not being able to see the markers.
I will close this out (as I only get moments to deal with issues and would rather not have empty issues open) but feel free to re-open it with a minimal config and some example of how I can reproduce this issue 🙏🏾