CODEWITHSUNDEEP
gitgit-merge
amphibient
amphibient

Reputation: 31318

What to do after manually merging in order to complete git pull?

I did a git pull and it told me it couldn't auto-merge because there were a few conflicting changes that got made on the remote and local concurrently. I did a manual merge. What do I need to do next in order to complete my pull?

RELATED: git pull merges no files if any of the deltas are conflicted (need manual merge)

Upvotes: 1

Views: 115

Answers (1)

Ry-
Ry-

Reputation: 225144

git add the files you changed, and then commit. The message should be filled in automatically with conflict details and a summary.

Upvotes: 3

Related Questions