mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-11 11:42:12 +02:00
5e95019b3f
The issue here was that we were using a string task but expecting to be able to set the origin straight after to point at the conflict, but because it's async it was actually resetting the origin to 0 after a little bit. The proper solution here is maybe to add a flag to that thing asking whether you want to reset main's origin. But I'm too lazy to do that right now so instead I'm just using setViewContent. That will probably cause issues in the future.