If you do a rebase or a pull and it has a merge conflict do the following
Check for file that is having conflict
git statusEdit code that has conflict and git add
git add -aCommit edit
git commit -am "Some message"
If you do a rebase or a pull and it has a merge conflict do the following
Check for file that is having conflict
git status
Edit code that has conflict and git add
git add -a
Commit edit
git commit -am "Some message"