How to Resolve a Merge Conflict When Using Git — SheCanCode