How can a conflict be settled in Git?

[olx24]

Short answer.

[montasim]

Edit the files to resolve any incompatible changes first, then use "git add" to add the corrected files and "git commit" to save the repaired merge.