{"thread":{"id":"28815","subject":"how to undo a merge","startedAt":"2011-11-01T07:27:43Z","lastAt":"2011-11-01T07:56:00Z","messageCount":2,"participants":["Hong-Ming Su","Vincent van Ravesteijn"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"178615","messageId":"CANiMyiEoaxAO3XxJMWEXP-L7C_xkxU0_nyDaor+TsJr-Ch7ARw@mail.gmail.com","threadId":"28815","inReplyTo":null,"subject":"how to undo a merge","fromName":"Hong-Ming Su","fromEmail":"halleyinvent@gmail.com","sentAt":"2011-11-01T07:27:43Z","receivedAt":"2011-11-01T07:27:43Z","isPatch":false,"sender":{"key":"halleyinvent@gmail.com","avatar":null},"body":"The commit graph before merging is:\nA--B <-master\n \\  \\\n  \\  \\\nC--D--E--F <- dev\n\ngit checkout master\ngit merge dev\n\nThe commit graph after merging is:\nA--B\n \\  \\\n  \\  \\\nC--D--E--F <- dev <-master\n\nmaster fast-forward to commit F.\nI want to \"undo\" the merge. What shall I do?\n\nThank you!\n\nBest regards,\nHong-Ming\n"},{"id":"178616","messageId":"4EAFA610.9080101@lyx.org","threadId":"28815","inReplyTo":"CANiMyiEoaxAO3XxJMWEXP-L7C_xkxU0_nyDaor+TsJr-Ch7ARw@mail.gmail.com","subject":"Re: how to undo a merge","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2011-11-01T07:56:00Z","receivedAt":"2011-11-01T07:56:00Z","isPatch":false,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"Op 1-11-2011 8:27, Hong-Ming Su schreef:\n> The commit graph before merging is:\n> A--B<-master\n>   \\  \\\n>    \\  \\\n> C--D--E--F<- dev\n>\n> git checkout master\n> git merge dev\n>\n> The commit graph after merging is:\n> A--B\n>   \\  \\\n>    \\  \\\n> C--D--E--F<- dev<-master\n>\n> master fast-forward to commit F.\n> I want to \"undo\" the merge. What shall I do?\n\ngit checkout master\ngit reset B\n\nVincent\n"}]}