How to rollback a single conflict resolution during git rebase

Question

In the middle of a long rebase I stumbled upon a following situation. I got conflicts in several files and started resolving them one by one and marking resolutions with git add. After all was done I realized I made a mistake in one of resolutions. What to do now?

I know I can always issue git rebase --abort and start afresh, but is where a more selective way to just rollback a single commit resolution added to index?

after adding, did you commit? – Hexana Oct 23 '15 at 15:44 — Hexana, Oct 23 '15 at 15:44
no, I've just added the resolution to index. – Dmitry Vyal Oct 23 '15 at 16:02 — Dmitry Vyal, Oct 23 '15 at 16:02

score 2 · Answer 1 · answered Oct 23 '15 at 18:41

Since you haven't run git rebase --continue yet, you're in good shape. You might want to save your incorrect-conflict-resolution version first since it may have a lot of correct stuff in it too:

cp path/to/wrong ~/tmp/save-wrong

for instance; then:

git checkout -m path/to/wrong

and you'll have the conflicts back again.

score 1 · Answer 2 · answered Oct 23 '15 at 15:53

1

If you do git log, this will give you a list of the commits. Find the SHA1 and then do git checkout SHA1 to move the head to the point just before the mistake.

answered Oct 23 '15 at 15:53

Hexana

1,095
2
12
35

I guess that way I will lose conflict marks made by git. – Dmitry Vyal Oct 23 '15 at 16:02
have a read at this, might be useful: http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html – Hexana Oct 23 '15 at 16:05

How to rollback a single conflict resolution during git rebase

2 Answers2