Tổng đài tư vấn: 033 688 8648
Hotline: 039 511 6390
git pull # fetch/merge partners changes
# merge fails, conflict
git checkout origin FILE_TO_REPLACE # replace changes with partners ver
git commit
