The next steps after resolving the conflicts manually are:-. git add . git status (this will show you which commands are necessary to continue automatic merge procedure) [command git suggests, e.g. git merge --continue, git cherry-pick --continue, git rebase --continue] answered Feb 19, 2016 at 14:00. More @Wikipedia
Hover over any link to get a description of the article. Please note that search keywords are sometimes hidden within the full article and don't appear in the description or title.