For reasons mentioned in previous commits, we will like to forcefully create a
new filenode sometimes.
Combination of this patch and previous one, we fixed a case in
This does not yet results in conflict where it should, I need to investigate
more about what's happening as it should be a change-delete conflict now.