@b0rk OMG so ours/theirs works backwards for rebases? This explains so many things...