Re: [tei-council] git help

I think if you only reset the head of the dev branch, your own syd branch will be where it was before the merge, won’t it? Once you checkout the syd-b branch you should be able to review its distinct commit history and make sure you have everything… if I understand what just happened! hope this helps, Elisa

On Nov 13, 2016, at 7:45 PM, Raffaele Viglianti wrote:

This will help: http://stackoverflow.com/questions/2389361/undo-a-git-merge-that-hasnt-been-...

To summarize: use `git log` to find the sha of the last commit before the merge, then hard reset to that commit with:

$ git reset --hard commit_sha

You will lose uncommitted changes, though.

Raff

On Sun, Nov 13, 2016 at 7:42 PM, Syd Bauman 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

-- 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