https://bugzilla.kernel.org/show_bug.cgi?id=213081 --- Comment #12 from Alan Stern (stern@xxxxxxxxxxxxxxxxxxx) --- In the failed reversion attempt above, what commit was checked out when you made the attempt? The right way to do this is to check out the commit and then do the reversion. In other words, the commit you want to revert should be the top one at the time you do the reversion. This is more or less equivalent to checking out the commit's parent. So for example, you should do: git checkout 674f8438c121 git revert 674f8438c121 That way there won't be any conflicts, and the fact that the commit is in the middle of a larger series won't matter. -- You may reply to this email to add a comment. You are receiving this mail because: You are watching the assignee of the bug.
