git conflict

[stegerjozsef]

as of the current implementation if both remote and local changes are present user is not told about a possible git conflict. yet, there are no helpers shown to handle conflict or give advise

Importance: low priority

[icsabai]

For some projects, like https://kooplex.vo.elte.hu/gitlab/icsabai/moleculedeeplearning, the kooplex git commit/update/revert is not accessible. not enough values to unpack (expected 3, got 1) appears at the top of the page, though both the gitlab and the jupyter git/ folder have been used.

[icsabai]

I have checked, from my projects, this: https://kooplex.vo.elte.hu/gitlab/icsabai/moleculedeeplearning is the only one with the above error, all others are fine (at least the git commit page comes up).