Git Flight Rules

1. Resolving current Index

   Errors:

   • needs merge
   • you need to resolve your current index first
     Resolution:
   • If want to revert back git reset --merge
   • Resolve merge conflict

2. reset status of any file in the local git index

   • git reset -- < file name >

3. restore file in the local repo

   • git checkout --- < file name >

Written with StackEdit.