badgerdev

+1 Last time fixed this by re-installling and re-importing, but it's back. Pull causes error "Please commit current changes or revert them before merging". Push causes error "Remote history conflict....