This is caused by the way we rebase local changes (compared to the filtered content) on top of remote changes. The problem is that local insertion operations that fall inside a remote delete are still inserted (are not discarded). This is expected in case of normal editing, but for rebase it's not good. |