We have had problems with data disappearing in git rebases when there is a conflict.

We tested this by changing the same line in a file on two different machines, and resolving the ensuing merge conflict when rebasing by selecting "resolve using mine". What actually happened is that we ended up with their version, not my version. The log in git showed only the "their" commit, the "my" commit was gone.

Marked as Critical since this results in data loss.