Thanks @Michael... When I was reading your reply, I was re-reading my quoted message ... and when I re-read "Updating b8a0e45..834dc62" I had a lights-on moment... That is the from *commit-id* and the to *commit-id* - I can use that...
Much easier the next day after a good nights sleep - in the heat of the moment, when all that is running through head is "Oh Sh**... F*** , F***, F***, F***, F***" ... not so simple to comprehend as a beginner... Thanks On Saturday, 25 July 2020 at 10:43:27 UTC+10 Michael Gersten wrote: > > On 2020-07-24, at 1:26 AM, SJW <[email protected]> wrote: > > > $ git checkout master > Switched to branch 'master' > > $ git merge staging > Updating b8a0e45..834dc62 > Fast-forward > > 23 files changed, 816 insertions(+), 550 deletions(-) > > ... lots of changes... Too many ... Oops! I meant to merge payments... > Wrong branch! > > > So if I understand correctly, you want to rewind "master" back to > "b8a0e45", and then re-merge payments? > > That should be > > git checkout master > git reset --hard b8a0e45 > git merge payments > > This is assuming no pushes or other other-person usage of your repository > since the oopsie. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/343665aa-0b8f-47fd-9ce4-204e875b6358n%40googlegroups.com.
