Conflict resolution tools: 2 bugs

[Violamot]

Assumption: User 1 and User 2 aligned at same master version. Button color Green;

User 1: Update button color to red User 1: Commit and Push User 2: Update button color to blue User 2: Commit User 2: Push -> "The repository has been updated since you last pulled. Try pulling before pushing" User 2: Pull -> "Merge conflict found" -> click on "view conflict"

-- Option A - Keep Ours (button from green to blue) -> BUG1 User 2: Click on "Keep Ours" BUG 1: list of "Changed files" disappears so 0 Changed files found -> Even if the commit message is automatically populated "Merge branch 'master' of https://github.com/Violamot/Git-test" it is not possible to do anything.

-- Option B - Keep theirs (button from green to red) -> BUG2 User 2: Click on "Keep theirs" User 2: Commit Merge branch User 2: Push BUG 2: Remotely the button is okay, is red. But locally, in the local file of user 2, the button still blue. Kactus doesn't notice that there is a difference between remote and local file.