2: Identify files that were reverted, but that you don't want to revert: {code}git status{endcode} 3: For each file that you don't want to revert: -{code}git reset FILENAME -git checkout FILENAME{endcode} +{code}git checkout HEAD FILENAME{endcode} 4: You can edit files here as well. 5: Add and commit your changes as usual {code}git add FILENAME