I had this for some time now, but today i came around to look at it really when it happend again
(that this doesn't happen for way more people...)

When i do a commit, but there is a conflict that i first have to resolve by doing an update i always get in a state that it deadlocks