just made to remove the merge conflict. We need to stage the
file befor…sage we see our file was modified reflecting the changes we just made to remove the merge conflict. We need to stage the file before we commit. This no different than a normal workflow.
Beginner’s Guide to Interactive Rebasing
Adding to commit is no different, but if you need to split commit into two, then you will need
git log HEAD~ to see diff of the changes being edited. And maybe
git reset HEAD~ to uncommit changes and commit them back more carefully.