perhaps I changed a file and this must be cached somewhere because even after removal of tree and cloning it back, merging cannot be resolved.
I tried a few things like
git init ...
git reset ...
but I do not know well what I am doing (I do read the manpages) and it does not alter the conflict
have a nice day







Sign In
Create Account


Back to top











