Git Partial Commit During Merge Task

Git Partial Commit During Merge Task: a task in Terminal-Lego-15k (Harbor dataset). This will create a merge conflict in file.php .