前几天我在GitHub项目上做了一些提交工作时犯了一个错误。我对git(本科生)仍然有点新意,我需要撤消合并。我不小心将主分支(如下图所示)合并到名为' wav2sig-scal-RMS-vals'的功能分支中。 image 我已经看了几个关于如何纠正这种情况的指南,但我无法弄清楚。这是git reflog返回的内容:
git reflog
9fb9307 HEAD@{0}: undo: checkout: moving from master to wav2sig-scale-RMS-vals
9c3d141 HEAD@{1}: undo: commit: Revert "Merge branch 'master' into wav2sig-scale-RMS-vals"
6933c35 HEAD@{2}: commit: Revert "Merge branch 'master' into wav2sig-scale-RMS-vals"
9c3d141 HEAD@{3}: checkout: moving from master to wav2sig-scale-RMS-vals
9fb9307 HEAD@{4}: clone: from https://github.com/UKY-Distributed-Audio-Lab/Array-Toolbox.git
有关如何解决此问题的任何想法?我知道它应该很简单。感谢。