Git comments
$ git reset --merge ORIG_HEAD
$ git merge --abort
$ git config user.name "xyz.abc"
$ git config user.email "example@example.com"
$ git commit -am 'Conflicts resolved'
//For knowing the status of the git
$ git status
//Change the file name
$ git commit -m "renamed app/src/main/res/layout/row_blog_details.xml to app/src/res/layout/blog_card.xml"