Syd, your local dev branch is probably out of date. Try to checkout (switch to) dev first and do a `git pull` there. Then switch back to your standoff branch and do the merge. (There is also `git pull -- all` but use with caution) Best Peter

Am 30.07.2020 um 00:29 schrieb Syd Bauman :

If I look at the sydb-standOff branch on GitHub[1], I find that the standOff branch is 24 commits behind dev. But if I try to merge, I am told that it is already up-to-date:

$ pwd | /home/syd/Documents/TEI_sydb-standOff $ git status -uno | On branch sydb-standOff | Your branch is up-to-date with 'origin/sydb-standOff'. | nothing to commit (use -u to show untracked files) $ git pull # not that I expect anything | Already up-to-date. $ git merge -m "What happens in dev does not stay in dev" dev | Already up-to-date. $ # What? Website says I'm behind 'dev' by 24 commits.

What am I doing something wrong here? Kinda pressing, because this branch should be folded into dev before we refrigerate (or at least before we freeze).

Notes ----- [1] https://github.com/TEIC/TEI/tree/sydb-standOff _______________________________________________ Tei-council mailing list Tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council