Redo part of an already committed merge

Question

I have committed a big merge. Later, it appears that some files weren\'t merged correctly. I want to redo just these files, not the entire merge - the merge was big and I do

Answer 1

Since git created a commit that represents your big merge with conflicts you could have just change that commit. To do that, in your working directory, do all the fixes, add to index and amend commit.

# do all the fixes
git add .
git commit --amend