index a66b2d73c50a99ff7beee379eaff330ab940a036..2f417a8f856094b3664eeff2ff3f0ce761c89503 100644 (file)
typically this would be done with
- git update-index <filename>
+ git add <filename>
After resolving the conflict manually and updating the index with the