[Tei-council] git help: 24 behind, but merge says up-to-date