Log in

HCMC Journal

Moses project 2023-01-23 to 2023-01-27

to : Martin Holmes
Minutes: 55

Over the weekend, ECH hit an svn conflict because two people were working on the same file at the same time. She tried to resolve it at the command line by merging, but it seems that wasn’t working. She came in to HCMC on Monday and we manually merged the files and solved the conflict.