2: {code}git checkout V7_8_1-branch{endcode}
3: {code}git revert SHA1ID{endcode}
4: {code}git checkout V7_8-branch{endcode}
-5: Merge the revert in, but don't commit yet:
+
+If you just want to ignore the revert entirely, you can say:
+
+1: {code}git merge -s ours V7_8_1-branch{endcode}
+
+If instead you want part of the revert, or want to make changes:
+
+1: Merge the revert in, but don't commit yet:
{code}git merge --no-commit V7_8_1-branch{endcode}
-6: Identify files you don't want to commit:
+2: Identify files that were reverted, but that you don't want to revert:
{code}git status{endcode}
-7: For each merged file:
-{code}git reset FILENAME{endcode}
-8: For each merged file:
-{code}git checkout FILENAME{endcode}
-9: Add and commit your changes as usual
+3: For each file that you don't want to revert:
+{code}git reset FILENAME
+git checkout FILENAME{endcode}
+4: You can edit files here as well.
+5: Add and commit your changes as usual
{code}git add FILENAME
git commit{endcode}
