Conflict non-resolution
Posted: Wed 08 Jul 2020 20:29
When resolving conflict from a merge, the program seems to only clear the conflict if I pick one side and make no other changes, if instead I modify the result, there does not appear to way to 'clear' the differences marked as conflicted. It is just weird as other merge editors I have used handle conflict resolution much more cleanly, but with this I can 'resolve' a conflict yet the program still acts like there is a conflict so I have to keep track of my progress more carefully.