git directory`
, `working directory`
and staging area
+First, you open the files which are in conflict and identify what are the conflicts.
+Next, based on what is accepted in your company or team, you either discuss with your
+colleagues on the conflicts or resolve them by yourself
+After resolving the conflicts, you add the files with `git add
+`git revert` creates a new commit which undoes the changes from last commit. + +`git reset` depends on the usage, can modify the index or change the commit which the branch head +is currently pointing at. +
+