Test conflict resolution behavior for rebases.