Does anyone know a non parametric equivalent to repeated measures ANOVA WITH a between subject factor?

I don't see the possibility to use Friedman Test with a subject factor (group). Shall I calculate the difference between two measurement points (there are only two) and then do a Mann-Whitney U Test for the two groups?

Similar questions and discussions