Hmmm… I think you want to reset the head of, um, the dev branch. The latest commit on dev looks to be sydb <https://github.com/sydb> Eeek! Forgot to update detest.log expected result. <https://github.com/TEIC/TEI/commit/b67bba47e6ea6659cbc8594727ca4d0ea1193551> Does that reflect the merge? Elisa
On Nov 13, 2016, at 7:42 PM, Syd Bauman <s.bauman@northeastern.edu> wrote:
Oy. I just (foolishly) did a
$ git checkout dev $ git merge sydb-X
when I meant the opposite:
$ git checkout sydb-X $ git merge dev
I haven't pushed anything, so no harm done; but I don't know how to git-undo what I just did in my local copy so I can easily move on. Any suggestions? -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council
PLEASE NOTE: postings to this list are publicly archived