Daily Archives: February 11, 2015

git error: cannot do a partial commit during a merge.

After a pull command, I ended up with a conflict in a file, which I fixed by manually editing the file (search for the

Posted in Computer Science | Tagged | 4 Comments